Brought forward from p3:

Sun Aug 30 21:18:59 1992  Ian Lance Taylor  (ian@cygnus.com)

	* Makefile.in: map program names through program_transform_name
	when installing.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0d013ef..24f6417 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 30 21:18:59 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+       * Makefile.in: map program names through program_transform_name
+       when installing.
+
 Sun Aug 30 18:09:03 1992  Per Bothner  (bothner@rtl.cygnus.com)
 
        * Makefile.in:  Bump to versions 1.97.90.

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index acccd00..a5b6625 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -21,8 +21,7 @@ srcdir = .
 
 prefix = /usr/local
 
-program_prefix =
-program_suffix =
+program_transform_name =
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
@@ -72,7 +71,7 @@ version=`./../gcc/gcc -dumpversion`
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = $(srcdir)/../texinfo/fsf
 
-MANPAGES= ar.1 nm.1 objdump.1 ranlib.1 size.1 strip.1
+MANPAGES= ar nm objdump ranlib size strip
 
 #CC=gcc -Wall
 # these two are almost the same program
@@ -317,13 +316,13 @@ install: all
        if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
        -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi
        for i in $(PROGS) ; do \
-               $(INSTALL_PROGRAM) $$i $(bindir)/$(program_prefix)$${i}$(program_suffix) ; \
+               $(INSTALL_PROGRAM) $$i $(bindir)/`t='$(program_transform_name)'; echo $$i | sed -e "" $$t` ; \
        done
        -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
        if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
        -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi
        for i in $(MANPAGES) ; do \
-               $(INSTALL_DATA) $(srcdir)/$$i $(man1dir)/$(program_prefix)$${i}$(program_suffix) ; \
+               $(INSTALL_DATA) $(srcdir)/$$i.1 $(man1dir)/`t='$(program_transform_name)'; echo $$i | sed -e "" $$t`.1 ; \
        done
 
 install-info: info