* Makefile.in (INSTALL): Set to @INSTALL@.

	(INSTALL_XFORM, INSTALL_XFORM1): Remove.
	(install): Depend upon installdirs.  Use $(program_transform_name)
	directly, rather than using $(INSTALL_XFORM) and
	$(INSTALL_XFORM1).
	(installdirs): New target.

diff --git a/sim/w65/ChangeLog b/sim/w65/ChangeLog
index 934bb8cbdf5fb80d135434dcd037e22549f067d8..1f3258539fbb7535acc44f85590690a40543f511 100644 (file)
--- a/sim/w65/ChangeLog
+++ b/sim/w65/ChangeLog
@@ -1,3 +1,12 @@
+Tue Apr 15 14:55:10 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * Makefile.in (INSTALL): Set to @INSTALL@.
+       (INSTALL_XFORM, INSTALL_XFORM1): Remove.
+       (install): Depend upon installdirs.  Use $(program_transform_name)
+       directly, rather than using $(INSTALL_XFORM) and
+       $(INSTALL_XFORM1).
+       (installdirs): New target.
+
 Mon Apr 14 16:30:02 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * Makefile.in (INSTALL): Change install.sh to install-sh.

diff --git a/sim/w65/Makefile.in b/sim/w65/Makefile.in
index c68d7f2ebeae58b3aa61e6ff88fed6404c923d73..277543a6a680402df6976eb65928810bd39cf222 100755 (executable)
--- a/sim/w65/Makefile.in
+++ b/sim/w65/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for GNU binary-file utilities
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
 
 # This file is part of GNU binutils.
 
@@ -46,11 +46,9 @@ includedir = @includedir@
 
 SHELL = /bin/sh
 
-INSTALL = `cd $(srcdir)/../..;pwd`/install-sh -c
+INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
-INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 
 AR = @AR@
 AR_FLAGS = qv
@@ -163,11 +161,15 @@ etags tags: TAGS
 TAGS: force
        etags $(INCDIR)/*.h $(srcdir)/*.[hc] 
 
-install: all 
+install: all installdirs
        for i in $(PROGS) ; do \
-         $(INSTALL_XFORM) $$i $(bindir)/`echo $$i | sed -e 's/.new//'` ; \
+         n=`echo $$i | sed -e 's/.new//' | sed '$(program_transform_name)'`; \
+         $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \
        done
 
+installdirs:
+       $(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
+
 install-info:
 
 clean-info: