mirror of
https://git.yoctoproject.org/poky
synced 2026-03-17 12:49:40 +01:00
a9c49dd5c7
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4101 311d38ba-8fff-0310-9ca6-ca027cbcb966
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
---
|
|
Makefile.am | 3 ++-
|
|
Makefile.in | 3 ++-
|
|
aclocal.in | 4 ++--
|
|
automake.in | 6 ++++--
|
|
4 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
--- automake-1.10.orig/Makefile.am
|
|
+++ automake-1.10/Makefile.am
|
|
@@ -73,11 +73,12 @@ do_subst = sed \
|
|
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
|
|
-e 's,[@]PERL[@],$(PERL),g' \
|
|
-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.
|
|
## Use chmod a-w to prevent people from editing the wrong file by accident.
|
|
automake: automake.in
|
|
--- automake-1.10.orig/Makefile.in
|
|
+++ automake-1.10/Makefile.in
|
|
@@ -183,11 +183,12 @@ do_subst = sed \
|
|
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
|
|
-e 's,[@]PERL[@],$(PERL),g' \
|
|
-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'
|
|
|
|
WGET = wget
|
|
WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
|
|
FETCHFILES = \
|
|
INSTALL \
|
|
--- automake-1.10.orig/aclocal.in
|
|
+++ automake-1.10/aclocal.in
|
|
@@ -1,10 +1,10 @@
|
|
-#!@PERL@ -w
|
|
+#!@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
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
--- automake-1.10.orig/automake.in
|
|
+++ automake-1.10/automake.in
|
|
@@ -1,10 +1,12 @@
|
|
-#!@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
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|