Move README and README.contributors to the project base directory.

Rename README.contributors to AUTHORS.

* doc/README: Move to the base folder.
* doc/README.contributors: Ditto.
* doc/README.contributors: Rename to AUTHORS.
* Makefile.direct (DOC_FILES): Rename doc/README to README;
rename doc/README.contributors to AUTHORS.
* Makefile.dj (OTHER_FILES): Ditto.
* README.QUICK: Ditto.
* doc/doc.am (dist_pkgdata_DATA): Ditto.
* include/gc_version.h: Ditto.
* Makefile.dj (OTHER_FILES): Wrap long lines.
* README.QUICK: Fix gc_version.h name.
* doc/doc.am (dist_pkgdata_DATA): Sort entries alphabetically.
* doc/doc.am: Expand all tabs to spaces.

diff --git a/doc/README.contributors b/AUTHORS
similarity index 100%
rename from doc/README.contributors
rename to AUTHORS

diff --git a/Makefile.direct b/Makefile.direct
index d0e19de28e9f669395a6ccaae8ae0bba19a45e7b..adf438de74521db9474069a5cc87b53d1e8abd42 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -112,8 +112,8 @@ DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.MacOSX doc/README.OS2 \
        doc/porting.html doc/overview.html \
        doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
        doc/README.sgi doc/README.solaris2 doc/README.uts \
-       doc/README.win32 doc/barrett_diagram doc/README \
-        doc/README.contributors doc/gc.man \
+       doc/README.win32 doc/barrett_diagram \
+        README AUTHORS doc/gc.man \
        doc/README.environment doc/tree.html doc/gcdescr.html \
        doc/README.autoconf doc/README.macros doc/README.ews4800 \
        doc/README.DGUX386 doc/README.arm.cross doc/leak.html \

diff --git a/Makefile.dj b/Makefile.dj
index 414826ccf55ee1246aa278ecff60ae36a901e4be..04aab8c502e78bcadae969d7afc80e698302127e 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -62,16 +62,16 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
            README tests/test.c test_cpp.cc extra/setjmp_t.c SMakefile.amiga \
-           SCoptions.amiga README.amiga README.win32 cord/README \
-          README.rs6000 README.QUICK TODO callprocs pc_excludes \
-           barrett_diagram README.OS2 README.Mac MacProjects.sit.hqx \
-           extra/MacOS.c EMX_MAKEFILE README.debugging \
-           Mac_files/datastart.c Mac_files/dataend.c \
+           SCoptions.amiga doc/README.amiga doc/README.win32 \
+          doc/README.cords doc/README.rs6000 README.QUICK TODO callprocs \
+           pc_excludes barrett_diagram doc/README.OS2 doc/README.Mac \
+           MacProjects.sit.hqx extra/MacOS.c EMX_MAKEFILE \
+           doc/README.debugging Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           extra/add_gc_prefix.c README.solaris2 README.sgi README.hp \
-           README.uts win32_threads.c gc.mak README.dj \
-           Makefile.dj README.alpha README.linux README.MacOSX Makefile.DLLs \
-          WCC_MAKEFILE
+           extra/add_gc_prefix.c doc/README.solaris2 doc/README.sgi \
+           doc/README.hp doc/README.uts win32_threads.c gc.mak doc/README.dj \
+           Makefile.dj doc/README.alpha doc/README.linux doc/README.MacOSX \
+          Makefile.DLLs WCC_MAKEFILE
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
        $(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h

diff --git a/doc/README b/README
similarity index 100%
rename from doc/README
rename to README

diff --git a/README.QUICK b/README.QUICK
index 26204cee6ef1084ad8a14c0ff494c65533fa0e44..30e6724564dba07950e2dd85bda59e678dbd39ac 100644 (file)
--- a/README.QUICK
+++ b/README.QUICK
@@ -18,11 +18,11 @@ that appears not to significantly restrict use of the collector, though
 use of those files for a purpose other than building the collector may
 require the resulting code to be covered by the GPL.
 
-For more details and the names of other contributors, see the
-doc/README* files and include/gc.h.  This file describes typical use of
-the collector on a machine that is already supported.
+For more details and the names of other contributors, see the README,
+doc/README.*, AUTHORS and include/gc.h files.  These files describe typical
+use of the collector on a machine that is already supported.
 
-For the version number, see doc/README or version.h.
+For the version number, see README or include/gc_version.h files.
 
 INSTALLATION:
 Under UN*X, Linux:
@@ -40,7 +40,7 @@ Under Windows 95, 98, Me, NT, or 2000:
 copy the appropriate makefile to MAKEFILE, read it, and type "nmake test".
 (Under Windows, this assumes you have Microsoft command-line tools
 installed, and suitably configured.)
-Read the machine specific README in the doc directory if one exists.
+Read the machine specific README.XXX in the doc directory if one exists.
 
 If you need thread support, you will need to follow the special
 platform-dependent instructions (win32), or define GC_THREADS
@@ -71,7 +71,7 @@ Define GC_DEBUG before including gc.h for additional checking.
 
 More documentation on the collector interface can be found at
 http://www.hpl.hp.com/personal/Hans_Boehm/gc/gcinterface.html,
-in doc/README and other files in the doc directory, and in include/gc.h .
+in README and other files in the doc directory, and in include/gc.h file.
 
 WARNINGS:
 

diff --git a/doc/doc.am b/doc/doc.am
index 3aca3b1424190e291d56537d20fe930ca7074947..b6af742f50f25c8f6b596261464f8ab2ad957866 100644 (file)
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -16,38 +16,38 @@
 # installed documentation
 #
 dist_pkgdata_DATA = \
-       doc/barrett_diagram \
-       doc/debugging.html \
-       doc/gc.man \
-       doc/gcdescr.html \
-       doc/README \
-       doc/README.amiga \
-       doc/README.arm.cross \
-       doc/README.autoconf \
-       doc/README.cmake \
-       doc/README.contributors \
-       doc/README.cords \
-       doc/README.DGUX386 \
-       doc/README.dj \
-       doc/README.environment \
-       doc/README.ews4800 \
-       doc/README.hp \
-       doc/README.linux \
-       doc/README.Mac \
-       doc/README.MacOSX \
-       doc/README.macros \
-       doc/README.OS2 \
-       doc/README.rs6000 \
-       doc/README.sgi \
-       doc/README.solaris2 \
-       doc/README.uts \
-       doc/README.win32 \
-       doc/README.win64 \
-       doc/overview.html \
-       doc/tree.html \
-       doc/leak.html \
-       doc/gcinterface.html \
-       doc/scale.html \
-       doc/README.darwin \
-       doc/simple_example.html \
-       doc/porting.html
+        AUTHORS \
+        README \
+        doc/README.DGUX386 \
+        doc/README.Mac \
+        doc/README.MacOSX \
+        doc/README.OS2 \
+        doc/README.amiga \
+        doc/README.arm.cross \
+        doc/README.autoconf \
+        doc/README.cmake \
+        doc/README.cords \
+        doc/README.darwin \
+        doc/README.dj \
+        doc/README.environment \
+        doc/README.ews4800 \
+        doc/README.hp \
+        doc/README.linux \
+        doc/README.macros \
+        doc/README.rs6000 \
+        doc/README.sgi \
+        doc/README.solaris2 \
+        doc/README.uts \
+        doc/README.win32 \
+        doc/README.win64 \
+        doc/barrett_diagram \
+        doc/debugging.html \
+        doc/gc.man \
+        doc/gcdescr.html \
+        doc/gcinterface.html \
+        doc/leak.html \
+        doc/overview.html \
+        doc/porting.html \
+        doc/scale.html \
+        doc/simple_example.html \
+        doc/tree.html

diff --git a/include/gc_version.h b/include/gc_version.h
index 4ea1a897282946bfc5207f3bcae5f7d257c0996e..2b3645ee7009dd95cec6918f506c8d43cf3323ef 100644 (file)
--- a/include/gc_version.h
+++ b/include/gc_version.h
@@ -34,7 +34,7 @@
      || GC_TMP_VERSION_MINOR != GC_VERSION_MINOR \
      || defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) \
      || (defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION)
-#   error Inconsistent version info.  Check doc/README, include/gc_version.h, and configure.ac.
+#   error Inconsistent version info.  Check README, include/gc_version.h and configure.ac.
 # endif
 #else
 # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR