aboutsummaryrefslogtreecommitdiff
path: root/sim/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sim/arm')
-rw-r--r--sim/arm/ChangeLog11
-rw-r--r--sim/arm/Makefile.in24
-rw-r--r--sim/arm/configure.in1
3 files changed, 20 insertions, 16 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index fda1c5c..700fc48 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,14 @@
+Fri Sep 8 14:27:20 1995 Ian Lance Taylor <ian@cygnus.com>
+
+ * configure.in: Remove AC_PROG_INSTALL.
+ * configure: Rebuild.
+ * Makefile.in (INSTALL): Revert to using install.sh.
+ (INSTALL_PROGRAM, INSTALL_DATA): Set to $(INSTALL).
+ (INSTALL_XFORM, INSTALL_XFORM1): Restore.
+ (mostlyclean): Make the same as clean, not distclean.
+ (clean): Remove config.log.
+ (install): Don't install in $(tooldir).
+
Thu Sep 7 12:00:17 1995 Doug Evans <dje@canuck.cygnus.com>
(Try to) Update to new bfd autoconf scheme.
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 380085c..54c6f00 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -47,9 +47,11 @@ docdir = $(datadir)/doc
SHELL = /bin/sh
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL = $(srcroot)/install.sh -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
+INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
AR = @AR@
AR_FLAGS = rc
@@ -124,11 +126,11 @@ tags etags: TAGS
TAGS: force
etags $(INCDIR)/*.h $(srcdir)/*.h $(srcdir)/*.c
-clean:
+mostlyclean clean:
rm -f *.[oa] *~ core *.E *.p *.ip aout-params.h gen-aout
- rm -f run libsim.a
+ rm -f run libsim.a config.log
-distclean mostlyclean realclean: clean
+distclean realclean: clean
rm -f TAGS
rm -f Makefile config.cache config.log config.status
@@ -138,15 +140,7 @@ force:
# Copy the files into directories where they will be run.
install:
- srcroot=`cd $(srcroot); pwd`; export srcroot; \
- $(INSTALL_XFORM) run $(bindir)/run ; \
- n=`t='$(program_transform_name)'; echo run | sed -e "" $$t`; \
- if [ -d $(tooldir) ] ; then \
- if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
- rm -f $(tooldir)/bin/run; \
- ln $(bindir)/$$n $(tooldir)/bin/run \
- || $(INSTALL_PROGRAM) run $(tooldir)/bin/run; \
- else true; fi
+ $(INSTALL_XFORM) run $(bindir)/run
install-man: run.1
$(INSTALL_XFORM1) $(srcdir)/run.1 $(man1dir)/run.1
diff --git a/sim/arm/configure.in b/sim/arm/configure.in
index 6aba96d..0eb7b73 100644
--- a/sim/arm/configure.in
+++ b/sim/arm/configure.in
@@ -14,6 +14,5 @@ AC_SUBST(HDEFINES)
AR=${AR-ar}
AC_SUBST(AR)
AC_PROG_RANLIB
-AC_PROG_INSTALL
AC_OUTPUT(Makefile)