[Gpg4win-commits] r102 - in trunk: . src

[scm-commit at wald.intevation.org]

Author: marcus
Date: 2005-12-31 13:17:54 +0100 (Sat, 31 Dec 2005)
New Revision: 102

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win.mk.in
Log:
2005-12-31  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac (glib): Make it a source package.
	* src/Makefile.am (gpg4win_bpkgs): Move glib to ...
	(gpg4win_spkgs): ... here.
	* patches/glib/01-giowin32.patch: New file.
	* patches/glib-2.6.6/01-giowin32.patch: New file.
	* src/config.site: New file.
	* src/gpg4win.mk.in (tsdir): New variable.
	(SETVARS): Use $(idir), not ${idir}.  Define CONFIG_SITE.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-12-31 12:13:34 UTC (rev 101)
+++ trunk/ChangeLog	2005-12-31 12:17:54 UTC (rev 102)
@@ -6,7 +6,7 @@
 	* patches/glib/01-giowin32.patch: New file.
 	* patches/glib-2.6.6/01-giowin32.patch: New file.
 	* src/config.site: New file.
-	* src/gpg4win.mk (tsdir): New variable.
+	* src/gpg4win.mk.in (tsdir): New variable.
 	(SETVARS): Use $(idir), not ${idir}.  Define CONFIG_SITE.
 
 2005-12-18  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2005-12-31 12:13:34 UTC (rev 101)
+++ trunk/src/gpg4win.mk.in	2005-12-31 12:17:54 UTC (rev 102)
@@ -26,6 +26,7 @@
 bdir := $(root)/build
 idir := $(root)/install
 ipdir := $(root)/install/pkgs
+tsdir := $(shell pwd)/${top_srcdir}
 pdir := $(shell pwd)/${top_srcdir}/patches
 
 
@@ -64,9 +65,10 @@
 	pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_configure)";		\
 	pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_make_args)";          \
 	pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
-	export PKG_CONFIG="$(shell pwd)/$(top_srcdir)/src/pkg-config";	\
-	export PKG_CONFIG_PATH="${idir}/lib/pkgconfig";			\
-	export SYSROOT="${idir}"
+	export PKG_CONFIG="$(tsdir)/src/pkg-config";			\
+	export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig";			\
+	export SYSROOT="$(idir)";					\
+	export CONFIG_SITE="$(tsdir)/src/config.site"
 endef
 
 # Support macro.  Unpack the archive $(1).