Commit 9df7f9db authored by Elliot Lee's avatar Elliot Lee
Browse files

Fix builddir != srcdir.



Fix builddir != srcdir.
parent e1ee90c9
......@@ -81,28 +81,29 @@ pdb_scripts = \
$(srcdir)/enums.pl: stamp-enums
@:
stamp-enums: $(srcdir)/enumgen.pl $(enum_headers) Makefile.am
(srcdir=$(srcdir) && $(PERL) $(srcdir)/enumgen.pl $(enum_headers)) \
(srcdir=$(srcdir) $(PERL) $(srcdir)/enumgen.pl $(enum_headers)) \
&& echo timestamp > stamp-enums
$(srcdir)/groups.pl: stamp-groups
@:
stamp-groups: Makefile.am
cd $(srcdir) \
&& echo "# This file is autogenerated" > $(srcdir)/groups.pl.tmp \
&& echo "@groups = qw(" >> $(srcdir)/groups.pl.tmp \
&& echo "# This file is autogenerated" > groups.pl.tmp \
&& echo "@groups = qw(" >> groups.pl.tmp \
&& (for pdb in $(pdb_sources); do \
group=`echo $$pdb | sed -e 's%pdb/\([^.]*\)\..*%\1%'`; \
echo " $$group" >> $(srcdir)/groups.pl.tmp; \
echo " $$group" >> groups.pl.tmp; \
done) \
&& echo ");" >> $(srcdir)/groups.pl.tmp \
&& echo ");" >> groups.pl.tmp \
&& (cmp -s groups.pl.tmp groups.pl || cp groups.pl.tmp groups.pl) \
&& rm groups.pl.tmp \
&& echo timestamp > stamp-groups
&& cd $(top_builddir)/tools/pdbgen && echo timestamp > 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) pdbgen.pl app) \
$(PERL) $(srcdir)/pdbgen.pl app) \
&& echo timestamp > stamp-app
all-local: stamp-app
......@@ -27,7 +27,8 @@ use lib $srcdir;
use Text::Wrap qw(wrap $columns);
$columns = 77;
BEGIN { require 'util.pl' }
#BEGIN { require 'util.pl' }
require 'util.pl';
*write_file = \&Gimp::CodeGen::util::write_file;
*FILE_EXT = \$Gimp::CodeGen::util::FILE_EXT;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment