From f062fbb75d601cf983fc3baf799c0475b0063f60 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Wed, 3 Sep 2003 10:01:24 +0000
Subject: [PATCH] Make ADDITIONAL_INSTALL_DIRS a globally available feature

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17610 72102866-910b-0410-8b05-ffd578937521
---
 Instance/library.make |  7 +------
 Instance/rules.make   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Instance/library.make b/Instance/library.make
index 705138a4..9456ad7b 100644
--- a/Instance/library.make
+++ b/Instance/library.make
@@ -230,8 +230,7 @@ internal-library-install_:: internal-install-dirs \
 
 # Depend on creating all the dirs
 internal-install-dirs:: $(FINAL_LIBRARY_INSTALL_DIR) \
-                          $(DLL_INSTALLATION_DIR) \
-                          $(ADDITIONAL_INSTALL_DIRS)
+                          $(DLL_INSTALLATION_DIR)
 
 # Now the rule to create each dir.  NB: Nothing gets executed if the dir 
 # already exists
@@ -241,10 +240,6 @@ $(FINAL_LIBRARY_INSTALL_DIR):
 $(DLL_INSTALLATION_DIR):
 	$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
 
-$(ADDITIONAL_INSTALL_DIRS):
-	$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
-
-
 ifeq ($(BUILD_DLL),yes)
 
 internal-install-lib::
diff --git a/Instance/rules.make b/Instance/rules.make
index 8c97ad55..81b053da 100644
--- a/Instance/rules.make
+++ b/Instance/rules.make
@@ -123,10 +123,20 @@ internal-$(GNUSTEP_TYPE)-uninstall:: before-$(GNUSTEP_INSTANCE)-uninstall \
 
 else
 
-internal-$(GNUSTEP_TYPE)-install:: before-$(GNUSTEP_INSTANCE)-install \
+# By adding an ADDITIONAL_INSTALL_DIRS variable (or xxx_INSTALL_DIRS)
+# you can request additional installation directories to be created
+# before the first installation target is executed.
+ADDITIONAL_INSTALL_DIRS += $($(GNUSTEP_INSTANCE)_INSTALL_DIRS)
+
+$(ADDITIONAL_INSTALL_DIRS):
+	$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
+
+internal-$(GNUSTEP_TYPE)-install:: $(ADDITIONAL_INSTALL_DIRS) \
+                                   before-$(GNUSTEP_INSTANCE)-install \
                                    internal-$(GNUSTEP_TYPE)-install_  \
                                    after-$(GNUSTEP_INSTANCE)-install
 
+# It would be nice to remove ADDITIONAL_INSTALL_DIRS here, if empty.
 internal-$(GNUSTEP_TYPE)-uninstall:: before-$(GNUSTEP_INSTANCE)-uninstall \
                                    internal-$(GNUSTEP_TYPE)-uninstall_  \
                                    after-$(GNUSTEP_INSTANCE)-uninstall