2009-04-03 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 3 Apr 2009 14:02:44 +0000 (14:02 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 3 Apr 2009 14:02:44 +0000 (14:02 +0000)
* src/Makefile.am (gpg4win_pkg_qt_post_install): New macro.
* src/QtCore.pc, src/QtGui.pc: New files.
* src/gpg4win.mk.in: Clear PKG_CONFIG_LIBDIR.

ChangeLog
src/Makefile.am
src/QtCore.pc [new file with mode: 0644]
src/QtGui.pc [new file with mode: 0644]
src/gpg4win.mk.in

index b70f3e5..aa10a64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-03  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/Makefile.am (gpg4win_pkg_qt_post_install): New macro.
+       * src/QtCore.pc, src/QtGui.pc: New files.
+       * src/gpg4win.mk.in: Clear PKG_CONFIG_LIBDIR.
+
 2009-04-02  Marcus Brinkmann  <marcus@g10code.de>
 
        * Makefile.am (EXTRA_DIST): Remove
index c66afa6..67c678b 100644 (file)
@@ -393,6 +393,12 @@ cd $$$${pkgidir}/lib;                                      \
 $(DLLTOOL) --output-lib libiconv.dll.a --def libiconv.def)
 endef
 
+# Qt is missing the pkgconfig files.
+define gpg4win_pkg_qt_post_install
+(mkdir $$$${pkgidir_dev}/lib/pkgconfig; \
+ cp $(srcdir)/QtCore.pc $(srcdir)/QtGui.pc $$$${pkgidir_dev}/lib/pkgconfig/)
+endef
+
 
 # kdesupport ships gettext, which we already have.  Remove a stow
 # conflict about that.  Also remove a stow conflict with kdelibs-lib.
diff --git a/src/QtCore.pc b/src/QtCore.pc
new file mode 100644 (file)
index 0000000..bcf6c23
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QtCore
+
+Name: Qtcore
+Description: Qtcore Library
+Version: 4.5.0
+Libs: -L${libdir} -lQtCore4 
+Cflags: -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I/usr/include -I${includedir}
+
diff --git a/src/QtGui.pc b/src/QtGui.pc
new file mode 100644 (file)
index 0000000..9f7b32e
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QtGui
+
+Name: Qtgui
+Description: Qtgui Library
+Version: 4.5.0
+Libs: -L${libdir} -lQtGui 
+Cflags: -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I/usr/include -I${includedir}
+Requires: QtCore
+
index 45ed31d..88a5174 100644 (file)
@@ -69,6 +69,7 @@ define SETVARS
        pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
        export PKG_CONFIG="$(tsdir)/src/pkg-config";                    \
        export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig";                 \
+       export PKG_CONFIG_LIBDIR="";                                    \
        export PATH="$(idir)/bin:$${PATH}";                             \
        export SYSROOT="$(idir)";                                       \
        export CONFIG_SITE="$(tsdir)/src/config.site"