From 787c6bfe7021f84607854e45e1f7297e957a1094 Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Sun, 8 Mar 1992 07:47:55 +0000
Subject: This is the second batch of makefile changes.  Libg++ makefiles were
 checked in earlier.  These are Makefiles relevant to the progressive release
 currently in progress.

* added exec_prefix
* default bindir now exec_prefix/bin
* default libdir now exec_prefix/lib
* default mandir now prefix/man
* default infodir now prefix/info
* added oldincludedir, default NULL
* remove all traces of the old -subdirs and -namesubdir support,
  including code, for loops, and all subdir/unsubdir stuff.
* remove old style staging targets {de-}stage[1234], comparison,
  bootstrapN, from all but the bootstrappable tools.
* added check targets.
* removed any "Last Mod" lines.
* forced copyrights to '92 and shifted some from Cygnus to FSF.
* added tooldir and program_prefix where needed.
* updated texinfo and man pages, removed all references to multiple
  hosts or targets.
---
 gas/Makefile.in      | 27 ++++++++++++++++-----------
 gas/doc/ChangeLog    | 13 +++++++++++++
 gas/doc/configure.in |  3 +++
 3 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 gas/doc/ChangeLog

(limited to 'gas')

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 2a0d188..159bc2e 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -28,10 +28,14 @@ srcdir = .
 
 prefix = /usr/local
 
-bindir = $(prefix)/bin
+program_prefix =
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+tooldir = $(libdir)
+
 datadir = $(prefix)/lib
-libdir = $(prefix)/lib
-mandir = $(datadir)/man
+mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -41,7 +45,7 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(datadir)/info
+infodir = $(prefix)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
 
@@ -113,7 +117,6 @@ REAL_HEADERS = \
 	$(srcdir)/struc-symbol.h \
 	$(srcdir)/subsegs.h \
 	$(srcdir)/symbols.h \
-	$(srcdir)/syscalls.h \
 	$(srcdir)/write.h
 
 LINKED_HEADERS = \
@@ -205,6 +208,8 @@ as.new: $(OBJS) $(LIBDEPS)
 	-mv -f as.new as.old
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o as.new $(OBJS) $(LIBS) $(LOADLIBES)
 
+check:
+
 config.status:
 	@echo You must configure gas.  Look at the INSTALL file for details.
 	@false
@@ -273,6 +278,7 @@ read.o : read.c as.h host.h targ-env.h obj-format.h \
   targ-cpu.h  struc-symbol.h \
   write.h flonum.h bignum.h expr.h frags.h hash.h read.h symbols.h tc.h obj.h \
    
+strerror.o : strerror.c
 strstr.o : strstr.c   
 subsegs.o : subsegs.c as.h host.h targ-env.h obj-format.h \
   targ-cpu.h  struc-symbol.h \
@@ -325,11 +331,10 @@ distclean: clean
 
 # Copy the files into directories where they will be run.
 install:
-	if [ "$(host_alias)" = "$(target_alias)" ] ; then \
-		$(INSTALL_PROGRAM) as.new $(bindir)/as ; \
-	else \
-		$(INSTALL_PROGRAM) as.new $(bindir)/as-$(target_alias) ; \
-	fi
+	-rm -f $(bindir)/$(program_prefix)as
+	$(INSTALL_PROGRAM) as.new $(bindir)/$(program_prefix)as
+	-rm -f  $(tooldir)/as
+	ln $(bindir)/$(program_prefix)as $(tooldir)/as
 
 # Create the installation directory.
 install-dir:
@@ -348,7 +353,7 @@ uninstall:
 # These exist for maintenance purposes.
 
 tags TAGS: force
-	etags $(REAL_SOURCES) $(REAL_HEADERS) $(srcdir)/README $(srcdir)/Makefile $(srcdir)/config/*.[hc]
+	etags $(REAL_HEADERS) $(REAL_SOURCES) $(srcdir)/config/*.[hc] $(srcdir)/README $(srcdir)/Makefile.in
 	
 bootstrap: as.new force
 	$(MAKE) stage1
diff --git a/gas/doc/ChangeLog b/gas/doc/ChangeLog
new file mode 100644
index 0000000..6fbeeff
--- /dev/null
+++ b/gas/doc/ChangeLog
@@ -0,0 +1,13 @@
+Sat Mar  7 00:06:25 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: commented out line for building as-all.texinfo.
+	  This is temporary.
+
+	* as.texinfo, as-all.texinfo: added menu item hooks.
+
+Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
diff --git a/gas/doc/configure.in b/gas/doc/configure.in
index f9820ea..e8b79a6 100644
--- a/gas/doc/configure.in
+++ b/gas/doc/configure.in
@@ -19,6 +19,9 @@
 #   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #
 
+# This file was written, and is maintained by K. Richard Pixley
+# <rich@cygnus.com>.
+
 # This file is a shell script that supplies the information necessary
 # to tailor a template configure script into the configure script
 # appropriate for this directory.  For more information, check any
-- 
cgit v1.1