Renamed make.texi to gnustep-make.texi

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26626 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,14 @@
+2008-06-11  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* Documentation/make.texi: Renamed to gnustep-make.texi.
+	* Documentation/gnustep-make.texi: New file.
+	* Documentation/GNUmakefile: Corresponding updates.
+	(Patch by Gareth Armstrong <gareth.armstrong@hp.com>)
+	
+	* Documentation/releasenotes.texi: Mention that the
+	make.info file was renamed to gnustep-make.info.
+	* RELEASENOTES: Regenerated.
+
 2008-06-10  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* openapp.in: Avoid 'echo -e' which is not portable (Suggestion

Documentation/GNUmakefile

@@ -66,14 +66,12 @@ include $(GNUSTEP_MAKEFILES)/common.make
 # FIXME: We should prefix everything with 'gnustep' because we
 # generate info files that we then put into the standard info
 # directories, and we don't want those to conflict with info files
-# from other packages!  For example, 'info make' should return GNU
-# make documentation, while 'info gnustep-make' should return
-# GNUstep-make documentation.  At the moment they would have the same
-# name instead, giving rise to unpleasant consequences!  For example
-# in a default installation, 'info make' would return gnustep-make
-# documentation (instead of GNU make one) because the INFOPATH is used
-# before built-in paths!
-DOCUMENT_NAME = gnustep-howto faq filesystem internals machines make userfaq
+# from other packages!   At the moment they could have the same
+# name instead, giving rise to unpleasant consequences!  
+# info 'faq' would probably return our faq before anything else
+# because the INFOPATH is used before built-in paths, but it's
+# still confusing to have conflicts.
+DOCUMENT_NAME = gnustep-howto faq filesystem internals machines gnustep-make userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -91,9 +89,9 @@ FAQ_TEXI_FILES = version.texi
 FAQ_TEXT_MAIN = faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
-make_TEXI_FILES = \
-make.texi
-make_DOC_INSTALL_DIR = Developer/Make/Manual/
+gnustep-make_TEXI_FILES = \
+gnustep-make.texi
+gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
 faq_TEXI_FILES = \
 faq.texi \

Documentation/gnustep-make.texi

@@ -1,6 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
-@setfilename make.info
+@setfilename gnustep-make.info
 @settitle GNUstep Makefile Package
 @c %**end of header
 

Documentation/releasenotes.texi

@@ -23,6 +23,15 @@ installed in /Library/GNUstep/GNUstep.conf).  To install in a
 different location, use the --with-config-file=PATH option, as in
 --with-config-file=/usr/pkg/etc/GNUstep.conf.
 
+@item gnustep-make.info renamed to make.info
+To prevent conflicts with the standard GNU 'make' info documentation,
+the gnustep-make one has been renamed.  Now you can access it as in
+'info gnustep-make' instead of 'info make', avoiding any conflicts and
+confusion.  Please note that this info documentation is in the
+core/make/Documentation subdirectory and at the moment is not
+automatically installed unless you explicitly go in that subdirectory
+and install it.
+
 @end table
 
 @section Version 2.0.5

RELEASENOTES

@@ -23,6 +23,15 @@ using a newer version of the make system.
      different location, use the -with-config-file=PATH option, as in
      -with-config-file=/usr/pkg/etc/GNUstep.conf.
 
+`gnustep-make.info renamed to make.info'
+     To prevent conflicts with the standard GNU 'make' info
+     documentation, the gnustep-make one has been renamed.  Now you can
+     access it as in 'info gnustep-make' instead of 'info make',
+     avoiding any conflicts and confusion.  Please note that this info
+     documentation is in the core/make/Documentation subdirectory and
+     at the moment is not automatically installed unless you explicitly
+     go in that subdirectory and install it.
+
 
 1.2 Version 2.0.5
 =================