Small tweaks to support working with GNUSTEP_INSTALLATION_DOMAIN instead of GNUSTEP_INSTALLATION_DIR

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

ChangeLog

@@ -1,3 +1,12 @@
+2007-02-13  Nicola Pero  <nicola.pero@meta-innovation.com>
+	
+	* Master/rules.make (internal-check-install-permissions): Only use
+	this rule if GNUSTEP_INSTALLATION_DIR is set.
+	* Instance/gswbundle.make (GSWBUNDLE_INSTALL_DIR): Set it by
+	default to GNUSTEP_LIBRARIES, which is the same as
+	GNUSTEP_INSTALLATION_DIR/Library/Libraries in the traditional
+	filesystem but will work with the new filesystem too.
+	
 2007-02-12  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* GNUmakefile.in (GNUSTEP_FLATTENED): Obsolete variable

Instance/gswbundle.make

@@ -51,7 +51,7 @@ ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
 endif
 
 ifeq ($(GSWBUNDLE_INSTALL_DIR),)
-GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
+  GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARIES)
 endif
 # The name of the bundle is in the BUNDLE_NAME variable.
 # The list of languages the bundle is localized in are in xxx_LANGUAGES

Master/rules.make

@@ -105,6 +105,7 @@ internal-all::
 
 after-all::
 
+ifneq ($(GNUSTEP_INSTALLATION_DIR),)
 internal-check-install-permissions:
 	@if [ -d "$(GNUSTEP_INSTALLATION_DIR)" \
 	      -a ! -w "$(GNUSTEP_INSTALLATION_DIR)" ]; then \
@@ -114,6 +115,9 @@ internal-check-install-permissions:
 	  echo ""; \
 	  exit 1; \
 	fi
+else
+internal-check-install-permissions:
+endif
 
 before-install::