Prefix all info documentation files with gnustep- to avoid conflicts …

…with other info files

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

ChangeLog

@@ -1,3 +1,19 @@
+2009-09-19  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	Renamed all info files by adding a gnustep- prefix so that there
+	is no chance of conflicts with info files from other software
+	(Suggestion from Michel Alexandre Salim
+	<salimma@fedoraproject.org>).
+	* Documentation/faq.texi: Renamed to gnustep-faq.texi.
+	* Documentation/filesystem.texi: Renamed to
+	gnustep-filesystem.texi.  Removed @setfilename.
+	* Documentation/internals.tex: Renamed to gnustep-internals.tex.
+	* Documentation/machines.texi: Renamed to gnustep-machines.texi.
+	Removed @setfilename.
+	* Documentation/gnustep-howto.texi: Updated include of 
+	machines.texi to include gnustep-machines.texi.
+	* Documentation/GNUmakefile: Updated for changes.
+
 2009-09-19  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* Instance/documentation.make: Moved internal-textdoc-install_,

Documentation/GNUmakefile

@@ -63,15 +63,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 # The documents to be generated
 
-# 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!   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
+# 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!
+DOCUMENT_NAME = gnustep-howto gnustep-faq gnustep-filesystem gnustep-internals gnustep-machines gnustep-make gnustep-userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -86,39 +81,39 @@ GNUstep-HOWTO_TEXT_MAIN = gnustep-howto.texi
 GNUstep-HOWTO_DOC_INSTALL_DIR = User/GNUstep/
 
 FAQ_TEXI_FILES = version.texi
-FAQ_TEXT_MAIN = faq.texi
+FAQ_TEXT_MAIN = gnustep-faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-make_TEXI_FILES = \
 gnustep-make.texi
 gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
-faq_TEXI_FILES = \
-faq.texi \
+gnustep-faq_TEXI_FILES = \
+gnustep-faq.texi \
 version.texi
-faq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-faq_DOC_INSTALL_DIR = User/GNUstep/
 
-userfaq_TEXI_FILES = \
-userfaq.texi \
+gnustep-userfaq_TEXI_FILES = \
+gnustep-userfaq.texi \
 version.texi
-userfaq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-userfaq_DOC_INSTALL_DIR = User/GNUstep/
 
-filesystem_TEXI_FILES = \
-filesystem.texi
-filesystem_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-filesystem_TEXI_FILES = \
+gnustep-filesystem.texi
+gnustep-filesystem_DOC_INSTALL_DIR = User/GNUstep/
 
-machines_TEXI_FILES = \
-machines.texi 
-machines_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-machines_TEXI_FILES = \
+gnustep-machines.texi 
+gnustep-machines_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-howto_TEXI_FILES = \
 gnustep-howto.texi \
 version.texi
 gnustep-howto_DOC_INSTALL_DIR = User/GNUstep/
 
-internals_LATEX_FILES = \
-internals.tex
-internals_DOC_INSTALL_DIR = Developer/Make/Manual/Internals/
+gnustep-internals_LATEX_FILES = \
+gnustep-internals.tex
+gnustep-internals_DOC_INSTALL_DIR = Developer/Make/Manual/Internals/
 
 INSTALL_TEXI_FILES = version.texi
 INSTALL_TEXT_MAIN = install.texi
@@ -171,4 +166,5 @@ after-uninstall::
 
 after-distclean::
 	rm -f version.texi
+
 endif

Documentation/filesystem.texi → Documentation/gnustep-filesystem.texi

@@ -1,7 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c GNUstep filesystem hierarchy
 @c %**start of header
-@setfilename filesystem.info
 @settitle GNUstep Filesystem Hierarchy Document
 @c %**end of header
 @setcontentsaftertitlepage

Documentation/gnustep-howto.texi

@@ -460,7 +460,7 @@ Good Luck!
 @node Machine Specific, Source via SVN, Tools and Applications, Top
 @chapter Machine Specific Instructions
 
-@include machines.texi
+@include gnustep-machines.texi
 
 
 @node Source via SVN,  , Machine Specific, Top

Documentation/machines.texi → Documentation/gnustep-machines.texi

@@ -1,5 +1,4 @@
 \input texinfo   @c -*-texinfo-*-
-@setfilename machines.info
 @settitle Platform Compatibility
 
 @ifclear HOWTO