diff options
| author | Chris Larson <clarson@kergoth.com> | 2005-03-09 21:38:43 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2005-03-09 21:38:43 +0000 |
| commit | 4828523eba3a9aaf08cdb8ae05b5bf7a018b922c (patch) | |
| tree | 8d055d3e0d3ffc11b40b723b7dc74675dd90ed37 /packages/automake/files | |
| parent | b362b75f3e586aa6c7abfe6e98a69f624c245e84 (diff) | |
Fix the automake paths fix.. it wasnt subst'ing @bindir@.
BKrev: 422f6ce3R6M5zlieiSdYXwhvpAAOSg
Diffstat (limited to 'packages/automake/files')
| -rw-r--r-- | packages/automake/files/path_prog_fixes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/packages/automake/files/path_prog_fixes.patch b/packages/automake/files/path_prog_fixes.patch index e69de29bb2..21ba1dde71 100644 --- a/packages/automake/files/path_prog_fixes.patch +++ b/packages/automake/files/path_prog_fixes.patch @@ -0,0 +1,46 @@ +Index: automake-1.9.3/Makefile.am +=================================================================== +--- automake-1.9.3.orig/Makefile.am 2004-10-25 14:57:30.000000000 -0400 ++++ automake-1.9.3/Makefile.am 2005-03-09 16:37:26.378381328 -0500 +@@ -66,7 +66,8 @@ + -e 's,[@]SHELL[@],$(SHELL),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ +- -e 's,[@]datadir[@],$(datadir),g' ++ -e 's,[@]datadir[@],$(datadir),g' \ ++ -e 's,[@]bindir[@],$(bindir),g' + + ## These files depend on Makefile so they are rebuilt if $(VERSION), + ## $(datadir) or other do_subst'ituted variables change. +Index: automake-1.9.3/aclocal.in +=================================================================== +--- automake-1.9.3.orig/aclocal.in 2004-10-10 12:10:24.000000000 -0400 ++++ automake-1.9.3/aclocal.in 2005-03-09 16:35:22.082277208 -0500 +@@ -1,8 +1,8 @@ +-#!@PERL@ ++#!@bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' + if 0; + + # aclocal - create aclocal.m4 by scanning configure.ac +Index: automake-1.9.3/automake.in +=================================================================== +--- automake-1.9.3.orig/automake.in 2004-10-21 16:23:26.000000000 -0400 ++++ automake-1.9.3/automake.in 2005-03-09 16:35:22.086276600 -0500 +@@ -1,8 +1,10 @@ +-#!@PERL@ -w ++#!@bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' + if 0; + + # automake - create Makefile.in from Makefile.am |