Use the perl found by configure. (#149826, Morten Welinder)

2004-11-29  Matthias Clasen  <mclasen@redhat.com>

	* Makefile.am: Use the perl found by configure.  (#149826,
	Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 1c72868..707c23f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am: Use the perl found by configure.  (#149826,
+       Morten Welinder)
+
 Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
 
        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c72868..707c23f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am: Use the perl found by configure.  (#149826,
+       Morten Welinder)
+
 Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
 
        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1c72868..707c23f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am: Use the perl found by configure.  (#149826,
+       Morten Welinder)
+
 Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
 
        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1c72868..707c23f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am: Use the perl found by configure.  (#149826,
+       Morten Welinder)
+
 Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
 
        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1c72868..707c23f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am: Use the perl found by configure.  (#149826,
+       Morten Welinder)
+
 Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
 
        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 434f98c..979da8d 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -14,10 +14,10 @@ INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
        $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
 glib.def: glib.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 $(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/  /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 $(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/       /' -e 's/G_GNUC_[^ ]*//g') > glib.def
 
 galias.h: glib.symbols
-         $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
+         $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
 
 if OS_UNIX
 TESTS = abicheck.sh

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 13d3a38..cca64c5 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -14,10 +14,10 @@ INCLUDES = \
        -DG_DISABLE_CONST_RETURNS
 
 gobject.def: gobject.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 $(srcdir)/gobject.symbols | sed -e '/^$$/d' -e 's/^/       /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 $(srcdir)/gobject.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def
 
 gobjectalias.h: gobject.symbols
-       $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h
+       $(PERL) $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh