From 9bc2ed46c5d9b7dae4c96b1e6e8b73fdb7de69e0 Mon Sep 17 00:00:00 2001
From: nicola <nicola@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 25 May 2008 10:04:03 +0000
Subject: [PATCH] Use gnustep-make v2 variables when installing documentation

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26568 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                           |  6 ++++++
 Documentation/GNUmakefile.postamble | 32 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 002a24d56..09a125816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-25  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* Documentation/GNUmakefile.postamble (after-install): Use
+	GNUSTEP_DOC instead of GNUSTEP_DOCUMENTATION and GNUSTEP_DOC_MAN
+	instead of GNUSTEP_DOCUMENTATION_MAN.
+
 2008-05-24 10:54-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Headers/AppKit/NSWindow.h: Minor cleanup and spacing.
diff --git a/Documentation/GNUmakefile.postamble b/Documentation/GNUmakefile.postamble
index 4e743d91b..6ce3871de 100644
--- a/Documentation/GNUmakefile.postamble
+++ b/Documentation/GNUmakefile.postamble
@@ -38,30 +38,30 @@ after-all::
 # Install the library reference documentation manually
 #
 after-install::
-	rm -rf $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)
-	$(MKINSTALLDIRS) $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)
+	rm -rf $(GNUSTEP_DOC)/$(Gui_DOC_INSTALL_DIR)
+	$(MKINSTALLDIRS) $(GNUSTEP_DOC)/$(Gui_DOC_INSTALL_DIR)
 	(cd Gui; $(TAR) cf - .) | \
-	  (cd $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR); $(TAR) xf -)
-	rm -rf $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)/CVS
-	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)
-	$(MKINSTALLDIRS) $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)
+	  (cd $(GNUSTEP_DOC)/$(Gui_DOC_INSTALL_DIR); $(TAR) xf -)
+	rm -rf $(GNUSTEP_DOC)/$(Gui_DOC_INSTALL_DIR)/CVS
+	rm -rf $(GNUSTEP_DOC)/$(GuiAdditions_DOC_INSTALL_DIR)
+	$(MKINSTALLDIRS) $(GNUSTEP_DOC)/$(GuiAdditions_DOC_INSTALL_DIR)
 	(cd GuiAdditions; $(TAR) cf - .) | \
-	  (cd $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR); $(TAR) xf -)
-	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)/CVS
-	( cd $(GNUSTEP_DOCUMENTATION)/$(GuiUser_DOC_INSTALL_DIR) ; \
+	  (cd $(GNUSTEP_DOC)/$(GuiAdditions_DOC_INSTALL_DIR); $(TAR) xf -)
+	rm -rf $(GNUSTEP_DOC)/$(GuiAdditions_DOC_INSTALL_DIR)/CVS
+	( cd $(GNUSTEP_DOC)/$(GuiUser_DOC_INSTALL_DIR) ; \
 	mv GuiUser/* . ; \
 	rm -rf GuiUser )
-	if [ ! -f $(GNUSTEP_DOCUMENTATION_MAN) ]; then \
-	  $(MKINSTALLDIRS) $(GNUSTEP_DOCUMENTATION_MAN); \
+	if [ ! -f $(GNUSTEP_DOC_MAN) ]; then \
+	  $(MKINSTALLDIRS) $(GNUSTEP_DOC_MAN); \
 	fi; \
-	if [ ! -f $(GNUSTEP_DOCUMENTATION_MAN)/man1 ]; then \
-	  $(MKINSTALLDIRS) $(GNUSTEP_DOCUMENTATION_MAN)/man1; \
+	if [ ! -f $(GNUSTEP_DOC_MAN)/man1 ]; then \
+	  $(MKINSTALLDIRS) $(GNUSTEP_DOC_MAN)/man1; \
 	fi; \
 	for file in $(MAN1_PAGES) __done; do \
 	  if [ $$file != __done ]; then \
-	    $(INSTALL_DATA) $$file $(GNUSTEP_DOCUMENTATION_MAN)/man1/$$file; \
-	    which gzip && rm -f $(GNUSTEP_DOCUMENTATION_MAN)/man1/$$file.gz \
-		&& gzip -9 $(GNUSTEP_DOCUMENTATION_MAN)/man1/$$file; \
+	    $(INSTALL_DATA) $$file $(GNUSTEP_DOC_MAN)/man1/$$file; \
+	    which gzip && rm -f $(GNUSTEP_DOC_MAN)/man1/$$file.gz \
+		&& gzip -9 $(GNUSTEP_DOC_MAN)/man1/$$file; \
 	  fi; \
 	done;