Attachment 1640 Details for Bug 1151 – kmymoney : fix plugins install directory

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] kmymoney : fix plugins install directory

kmymoney_fix_plugins_dir_1.diff (text/plain), 2.18 KB, created by Slávek Banko on 2013-11-14 19:09:50 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-11-14 19:09:50 CST

Size: 2.18 KB

patch

obsolete

>diff --git a/configure.in.in b/configure.in.in
>index a90f40f..b116f30 100644
>--- a/configure.in.in
>+++ b/configure.in.in
>@@ -78,6 +78,24 @@ fi
> 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
> #
> 
>diff --git a/kmymoney2/widgets/Makefile.am b/kmymoney2/widgets/Makefile.am
>index 6879430..76cd1c7 100644
>--- a/kmymoney2/widgets/Makefile.am
>+++ b/kmymoney2/widgets/Makefile.am
>@@ -68,19 +68,19 @@ kmmwidgets.cpp:	$(srcdir)/kmymoney.widgets
> # Hence the quick hack to include the required objects from the
> # libkmm_mymoney.so directly into libkmymoney.so
> 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
> install-exec-local: libkmymoney.la
>-	$(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer
>-	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer
>+	$(mkinstalldirs) $(DESTDIR)$(qt_plugins_dir)/designer
>+	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_plugins_dir)/designer
> 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
> 	for file in $(WIDGET_PNGS); do \
> 	  $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
> 	done
> 
> uninstall-local:
>-	-rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so
>+	-rm $(DESTDIR)$(qt_plugins_dir)/designer/libkmymoney.so
> 	for file in $(WIDGET_PNGS); do \
> 	  rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
> 	done

Actions: View | Diff

Attachments on bug 1151: 763 | 1638 | 1640