Tue Jul 22 14:44:00 1997 Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>

	* Makefile.in: Change stamp-* files to s-* files.  Use bfdt.texi
	rather than bfd.texi.
 	(DOCFILES): Change bfd.texi to bfdt.texi.
	* bfd.texinfo: Include bfdt.texi, not bfd.texi.

2 files changed, 71 insertions, 62 deletions

diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 198d0d1..931dd1f 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jul 22 14:44:00 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* Makefile.in: Change stamp-* files to s-* files.  Use bfdt.texi
+	rather than bfd.texi.
+ 	(DOCFILES): Change bfd.texi to bfdt.texi.
+	* bfd.texinfo: Include bfdt.texi, not bfd.texi.
+
 Mon Jun 16 15:33:15 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in (CC, CFLAGS): Substitute from configure script.
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index a614ad7..3810890 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -61,7 +61,7 @@ CC_FOR_BUILD = $(CC)
 	$(CC) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include $(H_CFLAGS) $(CFLAGS) $<
 
 DOCFILES = aoutx.texi  archive.texi archures.texi \
-	bfd.texi  cache.texi coffcode.texi \
+	bfdt.texi  cache.texi coffcode.texi \
 	core.texi elf.texi elfcode.texi  format.texi  libbfd.texi  \
 	opncls.texi  reloc.texi  section.texi  \
 	syms.texi  targets.texi init.texi hash.texi linker.texi
@@ -134,126 +134,128 @@ protos: libbfd.h libcoff.h bfd.h
 # We can't replace these rules with an implicit rule, because
 # makes without VPATH support couldn't find the .h files in `..'.
 
-# We use stamp-XXX targets so that we can distribute the info files,
+# We use s-XXX targets so that we can distribute the info files,
 # and permit people to rebuild them, without requiring the makeinfo
 # program.  If somebody tries to rebuild info, but none of the .texi
 # files have changed, then this Makefile will build chew, and will
 # build all of the stamp files, but will not actually have to rebuild
 # bfd.info.
 
-stamp-aoutx: $(MKDOC) $(srcdir)/../aoutx.h $(srcdir)/doc.str
+s-aoutx: $(MKDOC) $(srcdir)/../aoutx.h $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
 	$(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
-	touch stamp-aoutx
-aoutx.texi: stamp-aoutx
+	touch s-aoutx
+aoutx.texi: s-aoutx
 
-stamp-archive: $(MKDOC) $(srcdir)/../archive.c $(srcdir)/doc.str
+s-archive: $(MKDOC) $(srcdir)/../archive.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
 	$(srcdir)/../../move-if-change archive.tmp archive.texi
-	touch stamp-archive
-archive.texi: stamp-archive
+	touch s-archive
+archive.texi: s-archive
 
-stamp-archures: $(MKDOC) $(srcdir)/../archures.c $(srcdir)/doc.str
+s-archures: $(MKDOC) $(srcdir)/../archures.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
 	$(srcdir)/../../move-if-change archures.tmp archures.texi
-	touch stamp-archures
-archures.texi: stamp-archures
+	touch s-archures
+archures.texi: s-archures
 
-stamp-bfd: $(MKDOC) $(srcdir)/../bfd.c $(srcdir)/doc.str
+# We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
+# bfd.texinfo on an 8.3 filesystem.
+s-bfd: $(MKDOC) $(srcdir)/../bfd.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
-	$(srcdir)/../../move-if-change bfd.tmp bfd.texi
-	touch stamp-bfd
-bfd.texi: stamp-bfd
+	$(srcdir)/../../move-if-change bfd.tmp bfdt.texi
+	touch s-bfd
+bfdt.texi: s-bfd
 
-stamp-cache: $(MKDOC) $(srcdir)/../cache.c $(srcdir)/doc.str
+s-cache: $(MKDOC) $(srcdir)/../cache.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
 	$(srcdir)/../../move-if-change cache.tmp cache.texi
-	touch stamp-cache
-cache.texi: stamp-cache
+	touch s-cache
+cache.texi: s-cache
 
-stamp-coffcode: $(MKDOC) $(srcdir)/../coffcode.h $(srcdir)/doc.str
+s-coffcode: $(MKDOC) $(srcdir)/../coffcode.h $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
 	$(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
-	touch stamp-coffcode
-coffcode.texi: stamp-coffcode
+	touch s-coffcode
+coffcode.texi: s-coffcode
 
-stamp-core: $(MKDOC) $(srcdir)/../corefile.c $(srcdir)/doc.str
+s-core: $(MKDOC) $(srcdir)/../corefile.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
 	$(srcdir)/../../move-if-change core.tmp core.texi
-	touch stamp-core
-core.texi: stamp-core
+	touch s-core
+core.texi: s-core
 
-stamp-elf: $(MKDOC) $(srcdir)/../elf.c $(srcdir)/doc.str
+s-elf: $(MKDOC) $(srcdir)/../elf.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
 	$(srcdir)/../../move-if-change elf.tmp elf.texi
-	touch stamp-elf
-elf.texi: stamp-elf
+	touch s-elf
+elf.texi: s-elf
 
-stamp-elfcode: $(MKDOC) $(srcdir)/../elfcode.h $(srcdir)/doc.str
+s-elfcode: $(MKDOC) $(srcdir)/../elfcode.h $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
 	$(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
-	touch stamp-elfcode
-elfcode.texi: stamp-elfcode
+	touch s-elfcode
+elfcode.texi: s-elfcode
 
-stamp-format: $(MKDOC) $(srcdir)/../format.c $(srcdir)/doc.str
+s-format: $(MKDOC) $(srcdir)/../format.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
 	$(srcdir)/../../move-if-change format.tmp format.texi
-	touch stamp-format
-format.texi: stamp-format
+	touch s-format
+format.texi: s-format
 
-stamp-libbfd: $(MKDOC) $(srcdir)/../libbfd.c $(srcdir)/doc.str
+s-libbfd: $(MKDOC) $(srcdir)/../libbfd.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
 	$(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
-	touch stamp-libbfd
-libbfd.texi: stamp-libbfd
+	touch s-libbfd
+libbfd.texi: s-libbfd
 
-stamp-opncls: $(MKDOC) $(srcdir)/../opncls.c $(srcdir)/doc.str
+s-opncls: $(MKDOC) $(srcdir)/../opncls.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str  <$(srcdir)/../opncls.c >opncls.tmp
 	$(srcdir)/../../move-if-change opncls.tmp opncls.texi
-	touch stamp-opncls
-opncls.texi: stamp-opncls
+	touch s-opncls
+opncls.texi: s-opncls
 
-stamp-reloc: $(MKDOC) $(srcdir)/../reloc.c
+s-reloc: $(MKDOC) $(srcdir)/../reloc.c
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
 	$(srcdir)/../../move-if-change reloc.tmp reloc.texi
-	touch stamp-reloc
-reloc.texi: stamp-reloc
+	touch s-reloc
+reloc.texi: s-reloc
 
-stamp-section: $(MKDOC) $(srcdir)/../section.c $(srcdir)/doc.str
+s-section: $(MKDOC) $(srcdir)/../section.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
 	$(srcdir)/../../move-if-change section.tmp section.texi
-	touch stamp-section
-section.texi: stamp-section
+	touch s-section
+section.texi: s-section
 
-stamp-syms: $(MKDOC) $(srcdir)/../syms.c
+s-syms: $(MKDOC) $(srcdir)/../syms.c
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
 	$(srcdir)/../../move-if-change syms.tmp syms.texi
-	touch stamp-syms
-syms.texi: stamp-syms
+	touch s-syms
+syms.texi: s-syms
 
-stamp-targets: $(MKDOC) $(srcdir)/../targets.c $(srcdir)/doc.str
+s-targets: $(MKDOC) $(srcdir)/../targets.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
 	$(srcdir)/../../move-if-change targets.tmp targets.texi
-	touch stamp-targets
-targets.texi: stamp-targets
+	touch s-targets
+targets.texi: s-targets
 
-stamp-init: $(MKDOC) $(srcdir)/../init.c $(srcdir)/doc.str
+s-init: $(MKDOC) $(srcdir)/../init.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
 	$(srcdir)/../../move-if-change init.tmp init.texi
-	touch stamp-init
-init.texi: stamp-init
+	touch s-init
+init.texi: s-init
 
-stamp-hash: $(MKDOC) $(srcdir)/../hash.c $(srcdir)/doc.str
+s-hash: $(MKDOC) $(srcdir)/../hash.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
 	$(srcdir)/../../move-if-change hash.tmp hash.texi
-	touch stamp-hash
-hash.texi: stamp-hash
+	touch s-hash
+hash.texi: s-hash
 
-stamp-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
+s-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
 	$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
 	$(srcdir)/../../move-if-change linker.tmp linker.texi
-	touch stamp-linker
-linker.texi: stamp-linker
+	touch s-linker
+linker.texi: s-linker
 
 libbfd.h: $(srcdir)/../libbfd-in.h	\
 	$(srcdir)/../init.c		\
@@ -324,12 +326,12 @@ mostlyclean:
 	rm -rf *.log *.ps *~* *.dvi *# $(MKDOC) *.o
 
 clean: mostlyclean
-	rm -rf $(STAGESTUFF) stamp-*
+	rm -rf $(STAGESTUFF) s-*
 	rm -f *.p *.ip  bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log 
 
 distclean: mostlyclean
 	rm -f *.p *.ip  bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log 
-	rm -f stamp-*
+	rm -f s-*
 	rm -f Makefile config.status
 
 maintainer-clean realclean: clean