diff options
| -rw-r--r-- | gas/ChangeLog | 20 | ||||
| -rw-r--r-- | gas/Makefile.in | 27 |
2 files changed, 31 insertions, 16 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 77d9d1e..02d0beb 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,25 @@ +Tue Apr 15 13:04:47 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (srcroot): Remove. + (INSTALL): Set to @INSTALL@. + (INSTALL_XFORM, INSTALL_XFORM1): Remove. + (all, dvi): Don't set srcroot. + (install): Depend upon as.new, gasp.new, and installdirs. Use + $(program_transform_name) directly, rather than using + $(INSTALL_XFORM) and $(INSTALL_XFORM1). + (installdirs): New target. + * doc/Makefile.in (INSTALL_XFORM1): Remove. + (install): Depend upon installdirs. Use $(program_transform_name) + directly, rather than using $(INSTALL_XFORM) and + $(INSTALL_XFORM1). + (installdirs): New target. + (install-info-as): Run mkinstalldirs. + (install-info-gasp): Likewise. + Mon Apr 14 11:59:08 1997 Ian Lance Taylor <ian@cygnus.com> + * Makefile.in (INSTALL): Change install.sh to install-sh. + * symbols.c (resolve_symbol_value): Check for division by zero. From Thomas Graichen <graichen@rzpd.de>: diff --git a/gas/Makefile.in b/gas/Makefile.in index c71cf66..c6d3ed5 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -28,7 +28,6 @@ VPATH = @srcdir@ srcdir = @srcdir@ -srcroot = $(srcdir)/.. target_alias = @target_alias@ prefix = @prefix@ @@ -57,11 +56,9 @@ VERSION=cygnus-2.8.1 SHELL = /bin/sh -INSTALL = $${srcroot}/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 DISTSTUFF= make-gas.com m68k-parse.c itbl-parse.c itbl-lex.c @@ -432,12 +429,10 @@ GASPOBJS = \ hash.o all: .gdbinit as.new gasp.new - @srcroot=`cd $(srcroot); pwd`; export srcroot; \ - (cd doc ; $(MAKE) $(FLAGS_TO_PASS) all) + @cd doc; $(MAKE) $(FLAGS_TO_PASS) all dvi info install-info clean-info: - @srcroot=`cd $(srcroot); pwd`; export srcroot; \ - (cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@) + @cd doc; $(MAKE) $(FLAGS_TO_PASS) $@ make-gas.com: stamp-mk.com stamp-mk.com: vmsconf.sh Makefile @@ -686,18 +681,18 @@ maintainer-clean realclean: clean-here # Entry points `install', `includes' and `uninstall'. # Copy the files into directories where they will be run. -install: - srcroot=`cd $(srcroot); pwd`; export srcroot; \ - $(INSTALL_XFORM) as.new $(bindir)/as; \ - $(INSTALL_XFORM1) $(srcdir)/doc/as.1 $(man1dir)/as.1; \ - test -d $(tooldir) || mkdir $(tooldir); \ - test -d $(tooldir)/bin || mkdir $(tooldir)/bin; \ +install: as.new gasp.new installdirs n=`echo as | sed '$(program_transform_name)'`; \ + $(INSTALL_PROGRAM) as.new $(bindir)/$$n; \ + $(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$$n.1; \ rm -f $(tooldir)/bin/as; \ ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \ || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as - srcroot=`cd $(srcroot); pwd`; export srcroot; \ - $(INSTALL_XFORM) gasp.new $(bindir)/gasp + n=`echo gasp | sed '$(program_transform_name)'`; \ + $(INSTALL_PROGRAM) gasp.new $(bindir)/$$n + +installdirs: + $(SHELL) $(srcdir)/../mkinstalldirs $(bindir) $(man1dir) $(tooldir)/bin # Cancel installation by deleting the installed files. uninstall: |