From b1d749ed284b20532c54669fa802cbb4916004f0 Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@src.gnome.org>
Date: Thu, 8 Jul 1999 17:22:22 +0000
Subject: [PATCH] Fix typo. Clean up srcdir != builddir.

* tools/pdbgen/app.pl (generate): Fix typo.
* tools/pdbgen/Makefile.am: Clean up srcdir != builddir.
---
 ChangeLog                |  5 +++
 tools/pdbgen/Makefile.am | 75 +++++++++++++++++++++-------------------
 tools/pdbgen/app.pl      |  2 +-
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f5220737a..ac8207a321 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-08  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* tools/pdbgen/app.pl (generate): Fix typo.
+	* tools/pdbgen/Makefile.am: Clean up srcdir != builddir.
+
 Thu Jul  8 00:08:50 EDT 1999  Adrian Likins <alikins@redhat.com>
 
 	*app/interface.c: added type for _NETSCAPE_URL to the DnD stuff
diff --git a/tools/pdbgen/Makefile.am b/tools/pdbgen/Makefile.am
index 1734af4941..2d9f6c09a1 100644
--- a/tools/pdbgen/Makefile.am
+++ b/tools/pdbgen/Makefile.am
@@ -47,48 +47,49 @@ EXTRA_DIST = \
 	$(pdb_sources)
 
 enum_headers = \
-	$(top_srcdir)/app/appenv.h		\
-	$(top_srcdir)/app/blend.h		\
-	$(top_srcdir)/app/bucket_fill.h		\
-	$(top_srcdir)/app/channel.h		\
-	$(top_srcdir)/app/channel_ops.h		\
-	$(top_srcdir)/app/clone.h		\
-	$(top_srcdir)/app/color_balance.h	\
-	$(top_srcdir)/app/convert.h		\
-	$(top_srcdir)/app/convolve.h		\
-	$(top_srcdir)/app/eraser.h		\
-	$(top_srcdir)/app/gimpdrawable.h	\
-	$(top_srcdir)/app/gimpimage.h		\
-	$(top_srcdir)/app/hue_saturation.h	\
-	$(top_srcdir)/app/layer.h		\
-	$(top_srcdir)/app/layerF.h		\
-	$(top_srcdir)/app/lut_funcs.h		\
-	$(top_srcdir)/app/paint_core.h		\
-	$(top_srcdir)/app/paint_funcs.h		\
-	$(top_srcdir)/app/plug_in.h		\
-	$(top_srcdir)/app/procedural_db.h	\
-	$(top_srcdir)/app/shear_tool.h		\
-	$(top_srcdir)/app/text_tool.h
+	../../app/appenv.h		\
+	../../app/blend.h		\
+	../../app/bucket_fill.h		\
+	../../app/channel.h		\
+	../../app/channel_ops.h		\
+	../../app/clone.h		\
+	../../app/color_balance.h	\
+	../../app/convert.h		\
+	../../app/convolve.h		\
+	../../app/eraser.h		\
+	../../app/gimpdrawable.h	\
+	../../app/gimpimage.h		\
+	../../app/hue_saturation.h	\
+	../../app/layer.h		\
+	../../app/layerF.h		\
+	../../app/lut_funcs.h		\
+	../../app/paint_core.h		\
+	../../app/paint_funcs.h		\
+	../../app/plug_in.h		\
+	../../app/procedural_db.h	\
+	../../app/shear_tool.h		\
+	../../app/text_tool.h
 
 pdb_scripts = \
-	$(srcdir)/pdbgen.pl	\
-	$(srcdir)/stddefs.pdb	\
-	$(srcdir)/pdb.pl	\
-	$(srcdir)/util.pl	\
-	$(srcdir)/enums.pl	\
-	$(srcdir)/groups.pl
+	pdbgen.pl	\
+	stddefs.pdb	\
+	pdb.pl		\
+	util.pl		\
+	enums.pl	\
+	groups.pl
 
 $(srcdir)/enums.pl: stamp-enums
 	@:
 stamp-enums: $(srcdir)/enumgen.pl $(enum_headers) Makefile.am
-	(srcdir=$(srcdir) $(PERL) $(srcdir)/enumgen.pl $(enum_headers)) \
-	&& echo timestamp > stamp-enums
+	rootme=`pwd`; \
+	cd $(srcdir) && $(PERL) enumgen.pl $(enum_headers) \
+	&& echo timestamp > $$rootme/stamp-enums
 
 $(srcdir)/groups.pl: stamp-groups
 	@:
 
 stamp-groups: Makefile.am
-	cd $(srcdir) \
+	rootme=`pwd`; cd $(srcdir) \
 	&& echo "# This file is autogenerated" > groups.pl.tmp \
 	&& echo "@groups = qw(" >> groups.pl.tmp \
 	&& (for pdb in $(pdb_sources); do \
@@ -98,12 +99,14 @@ stamp-groups: Makefile.am
 	&& echo ");" >> groups.pl.tmp \
 	&& (cmp -s groups.pl.tmp groups.pl || cp groups.pl.tmp groups.pl) \
 	&& rm groups.pl.tmp \
-	&& cd $(top_builddir)/tools/pdbgen && echo timestamp > stamp-groups
+	&& echo timestamp > $$rootme/stamp-groups
 
 stamp-app: $(srcdir)/app.pl $(pdb_scripts) $(pdb_sources)
-	(srcdir=$(srcdir) destdir=$(top_srcdir) \
-	 PDBGEN_BACKUP=$(PDBGEN_BACKUP) PDBGEN_GROUPS=$(PDBGEN_GROUPS) \
-	 $(PERL) $(srcdir)/pdbgen.pl app) \
-	&& echo timestamp > stamp-app
+	rootme=`pwd`; \
+	destdir=`cd $(top_srcdir) && pwd`; export destdir; \
+	cd $(srcdir) && \
+	   PDBGEN_BACKUP=$(PDBGEN_BACKUP) PDBGEN_GROUPS=$(PDBGEN_GROUPS) \
+	   $(PERL) pdbgen.pl app \
+	&& echo timestamp > $$rootme/stamp-app
 
 all-local: stamp-app
diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl
index 2eeddb9e2e..8ace241c9a 100644
--- a/tools/pdbgen/app.pl
+++ b/tools/pdbgen/app.pl
@@ -709,7 +709,7 @@ GPL
 	}
 
 	my $cfile = "$destdir/${group}_cmds.c$FILE_EXT";
-	open CFILE, "> $cfile" or die "Can't open $cmdfile: $!\n";
+	open CFILE, "> $cfile" or die "Can't open $cfile: $!\n";
 	print CFILE $gpl;
 	print CFILE qq/#include "procedural_db.h"\n\n/;
 	print CFILE $headers, "\n";