Fix plugins install directory

This resolves Bug 1151
r14.0.x
Slávek Banko 11 years ago
parent bd16154f8f
commit 848ba26243

@ -77,6 +77,24 @@ if test "x$X" = "x"; then
fi fi
UIC=`echo $UIC -L \$\(top_builddir\)/kmymoney2/widgets/.libs` UIC=`echo $UIC -L \$\(top_builddir\)/kmymoney2/widgets/.libs`
#
# get qt plugins directory
#
if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists qt-mt ; then
qt_plugins_dir="`pkg-config --variable=pluginsdir qt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
qt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
fi
fi
fi
if test "x$qt_plugins_dir" = "x"; then
qt_plugins_dir=$(qt_libraries)/../plugins
fi
AC_SUBST(qt_plugins_dir)
# #
# create header directory, make symlinks # create header directory, make symlinks
# #

@ -68,19 +68,19 @@ kmmwidgets.cpp: $(srcdir)/kmymoney.widgets
# Hence the quick hack to include the required objects from the # Hence the quick hack to include the required objects from the
# libkmm_mymoney.so directly into libkmymoney.so # libkmm_mymoney.so directly into libkmymoney.so
libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_plugins_dir)/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
if INSTALL_QTDESIGNER_SUPPORT if INSTALL_QTDESIGNER_SUPPORT
install-exec-local: libkmymoney.la install-exec-local: libkmymoney.la
$(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer $(mkinstalldirs) $(DESTDIR)$(qt_plugins_dir)/designer
$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_plugins_dir)/designer
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR) $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
for file in $(WIDGET_PNGS); do \ for file in $(WIDGET_PNGS); do \
$(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \ $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
done done
uninstall-local: uninstall-local:
-rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so -rm $(DESTDIR)$(qt_plugins_dir)/designer/libkmymoney.so
for file in $(WIDGET_PNGS); do \ for file in $(WIDGET_PNGS); do \
rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \ rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
done done

Loading…
Cancel
Save