Fri Dec 6 22:58:48 1991 K. Richard Pixley (rich at rtl.cygnus.com)

	* Makefile.in: install using INSTALL_DATA, added standards.text
	  support.

	* configure.in: mark directory as target dependent.  configure
	  nows works in objdir always so make file existence checks
	  against ${srcdir}.

Thu Dec  5 22:46:19 1991  K. Richard Pixley  (rich at rtl.cygnus.com)

	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
	  and mandir now keyed off datadir by default.

1 files changed, 48 insertions, 24 deletions

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index b54cabf..160aece 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -21,13 +21,38 @@
 # $Id$
 
 srcdir = .
-ddestdir = /usr/local
-libdir = $(ddestdir)/lib
-docdir = $(srcdir)$(subdir)/doc
-includedir= $(ddestdir)/include
-RANLIB = ranlib
+
+prefix = /usr/local
+
+bindir = $(prefix)/bin
+datadir = $(prefix)/lib
+libdir = $(prefix)/lib
+mandir = $(datadir)/man
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+docdir = $(datadir)/doc
+
+SHELL = /bin/sh
+
+INSTALL = install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+
 AR = ar
-AR_FLAGS = clq
+AR_FLAGS = qv
+BISON = bison
+MAKEINFO = makeinfo
+RANLIB = ranlib
+
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 DEP = mkdep
@@ -76,8 +101,8 @@ STAGESTUFF = $(TARGETLIB) $(OFILES)
 all: $(TARGETLIB) 
 	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)"
 
-all-info: force
-	$(MAKE) subdir_do DO=all-info "DODIRS=$(SUBDIRS)"
+info: force
+	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
 
 install-info: force
 	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
@@ -101,8 +126,8 @@ subdir_do: force
 				$(MAKE) \
 					"against=$(against)" \
 					"AR=$(AR)" \
-					"CC=$(CC)" \
 					"AR_FLAGS=$(AR_FLAGS)" \
+					"CC=$(CC)" \
 					"RANLIB=$(RANLIB)" \
 					"BISON=$(BISON)" $(DO)) ; then true ; \
 			else exit 1 ; fi ; \
@@ -217,10 +242,9 @@ roll:
 force:
 
 install:
-	cp libbfd.a $(libdir)/libbfd.a.new
-	$(RANLIB) $(libdir)/libbfd.a.new
-	mv -f $(libdir)/libbfd.a.new $(libdir)/libbfd.a
-	cp $(INCDIR)/bfd.h $(includedir)/bfd.h
+	$(INSTALL_DATA) libbfd.a $(libdir)/libbfd.a
+	$(RANLIB) $(libdir)/libbfd.a
+	$(INSTALL_DATA) $(INCDIR)/bfd.h $(includedir)/bfd.h
 	$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)"
 
 # Target to uncomment host-specific lines in this makefile.  Such lines must
@@ -278,17 +302,17 @@ libbfd.o : libbfd.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h
 opncls.o : opncls.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
 bfd.o : bfd.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
 archive.o : archive.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/ar.h $(INCDIR)/ranlib.h 
+  $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h 
 targets.o : targets.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
 cache.o : cache.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
 archures.o : archures.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h 
 aout64.o : aout64.c 
 aout32.o : aout32.c aoutx.h $(INCDIR)/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout64.h \
-  $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def $(INCDIR)/ar.h 
+  $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h 
 sunos.o : sunos.c aoutf1.h $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
-  libaout.h libbfd.h $(INCDIR)/aout64.h $(INCDIR)/stab.gnu.h \
-  $(INCDIR)/stab.def $(INCDIR)/ar.h 
+  libaout.h libbfd.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h 
 demo64.o : demo64.c 
 
 srec.o : srec.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
@@ -297,7 +321,7 @@ oasys.o : oasys.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
 ieee.o : ieee.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/ieee.h libieee.h 
 coff-h8300.o: coff-h8300.c  $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff-h8300.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h 
+  $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h 
 format.o : format.c $(INCDIR)/bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
 section.o : section.c $(INCDIR)/bfd.h \
@@ -313,13 +337,13 @@ reloc.o : reloc.c $(INCDIR)/bfd.h \
 trad-core.o : trad-core.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
   libbfd.h libaout.h 
 newsos3.o : newsos3.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout64.h $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def \
-  $(INCDIR)/ar.h libaout.h 
+  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/ar.h libaout.h 
 i386aout.o : i386aout.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout64.h $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def \
-  $(INCDIR)/ar.h libaout.h 
+  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/ar.h libaout.h 
 bout.o : bout.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/bout.h $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def libaout.h 
+  $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h 
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY