Use $SED in bfd Makefile

	PR 18667
	* Makefile.am: Use $(SED) in place of sed throughout.
	* Makefile.in: Regenerate.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fb48800..e0d32ac 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2015-08-18  Alan Modra  <amodra@gmail.com>
 
+       PR 18667
+       * Makefile.am: Use $(SED) in place of sed throughout.
+       * Makefile.in: Regenerate.
+
+2015-08-18  Alan Modra  <amodra@gmail.com>
+
        * elf64-ppc.c (ppc64_elf_func_desc_adjust): Don't redefine .TOC.
        if already defined, and set linker_def.
        (ppc64_elf_set_toc): Use .TOC. value if defined other than by

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index e28904a..bf73057 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -860,7 +860,7 @@ noinst_LIBRARIES = libbfd.a
 libbfd_a_SOURCES =
 
 stamp-lib: libbfd.la
-       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       libtooldir=`$(LIBTOOL) --config | $(SED) -n -e 's/^objdir=//p'`; \
        if [ -f $$libtooldir/libbfd.a ]; then \
          cp $$libtooldir/libbfd.a libbfd.tmp; \
          $(RANLIB) libbfd.tmp; \
@@ -875,7 +875,7 @@ libbfd.a: stamp-lib ; @true
 # itself, but is included by targets.c.
 targmatch.h: config.bfd targmatch.sed
        rm -f targmatch.h
-       sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
+       $(SED) -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
        mv -f targmatch.new targmatch.h
 
 # When compiling archures.c and targets.c, supply the default target
@@ -919,49 +919,49 @@ endif
 
 elf32-target.h : elfxx-target.h
        rm -f elf32-target.h
-       sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
        mv -f elf32-target.new elf32-target.h
 
 elf64-target.h : elfxx-target.h
        rm -f elf64-target.h
-       sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
        mv -f elf64-target.new elf64-target.h
 
 elf32-aarch64.c : elfnn-aarch64.c
        rm -f elf32-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf32-aarch64.new
-       sed -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
        mv -f elf32-aarch64.new elf32-aarch64.c
 
 elf64-aarch64.c : elfnn-aarch64.c
        rm -f elf64-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf64-aarch64.new
-       sed -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
        mv -f elf64-aarch64.new elf64-aarch64.c
 
 elf32-ia64.c : elfnn-ia64.c
        rm -f elf32-ia64.c
-       sed -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
        mv -f elf32-ia64.new elf32-ia64.c
 
 elf64-ia64.c : elfnn-ia64.c
        rm -f elf64-ia64.c
-       sed -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
        mv -f elf64-ia64.new elf64-ia64.c
 
 peigen.c : peXXigen.c
        rm -f peigen.c
-       sed -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
+       $(SED) -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
        mv -f peigen.new peigen.c
 
 pepigen.c : peXXigen.c
        rm -f pepigen.c
-       sed -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
+       $(SED) -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
        mv -f pepigen.new pepigen.c
 
 pex64igen.c: peXXigen.c
        rm -f pex64igen.c
-       sed -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
+       $(SED) -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
        mv -f pex64igen.new pex64igen.c
 
 BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
@@ -1042,18 +1042,18 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
-       @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+       @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        . $(srcdir)/development.sh ;\
        if test "$$development" = true ; then \
-         bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+         bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
        fi ;\
-       sed -e "s,@bfd_version@,$$bfd_version," \
+       $(SED) -e "s,@bfd_version@,$$bfd_version," \
            -e "s,@bfd_version_string@,$$bfd_version_string," \
            -e "s,@bfd_version_package@,$$bfd_version_package," \
            -e "s,@report_bugs_to@,$$report_bugs_to," \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index aa885e3..9fd0d68 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1961,7 +1961,7 @@ stamp-ofiles: Makefile
 ofiles: stamp-ofiles ; @true
 
 stamp-lib: libbfd.la
-       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       libtooldir=`$(LIBTOOL) --config | $(SED) -n -e 's/^objdir=//p'`; \
        if [ -f $$libtooldir/libbfd.a ]; then \
          cp $$libtooldir/libbfd.a libbfd.tmp; \
          $(RANLIB) libbfd.tmp; \
@@ -1976,7 +1976,7 @@ libbfd.a: stamp-lib ; @true
 # itself, but is included by targets.c.
 targmatch.h: config.bfd targmatch.sed
        rm -f targmatch.h
-       sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
+       $(SED) -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
        mv -f targmatch.new targmatch.h
 
 # When compiling archures.c and targets.c, supply the default target
@@ -2005,49 +2005,49 @@ dwarf2.lo: dwarf2.c Makefile
 
 elf32-target.h : elfxx-target.h
        rm -f elf32-target.h
-       sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
        mv -f elf32-target.new elf32-target.h
 
 elf64-target.h : elfxx-target.h
        rm -f elf64-target.h
-       sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
        mv -f elf64-target.new elf64-target.h
 
 elf32-aarch64.c : elfnn-aarch64.c
        rm -f elf32-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf32-aarch64.new
-       sed -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
        mv -f elf32-aarch64.new elf32-aarch64.c
 
 elf64-aarch64.c : elfnn-aarch64.c
        rm -f elf64-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf64-aarch64.new
-       sed -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
        mv -f elf64-aarch64.new elf64-aarch64.c
 
 elf32-ia64.c : elfnn-ia64.c
        rm -f elf32-ia64.c
-       sed -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
        mv -f elf32-ia64.new elf32-ia64.c
 
 elf64-ia64.c : elfnn-ia64.c
        rm -f elf64-ia64.c
-       sed -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
        mv -f elf64-ia64.new elf64-ia64.c
 
 peigen.c : peXXigen.c
        rm -f peigen.c
-       sed -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
+       $(SED) -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
        mv -f peigen.new peigen.c
 
 pepigen.c : peXXigen.c
        rm -f pepigen.c
-       sed -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
+       $(SED) -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
        mv -f pepigen.new pepigen.c
 
 pex64igen.c: peXXigen.c
        rm -f pex64igen.c
-       sed -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
+       $(SED) -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
        mv -f pex64igen.new pex64igen.c
 $(BFD32_LIBS) \
  $(BFD64_LIBS) \
@@ -2110,18 +2110,18 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
-       @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+       @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        . $(srcdir)/development.sh ;\
        if test "$$development" = true ; then \
-         bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+         bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
        fi ;\
-       sed -e "s,@bfd_version@,$$bfd_version," \
+       $(SED) -e "s,@bfd_version@,$$bfd_version," \
            -e "s,@bfd_version_string@,$$bfd_version_string," \
            -e "s,@bfd_version_package@,$$bfd_version_package," \
            -e "s,@report_bugs_to@,$$report_bugs_to," \