INSTALL_ROOT_DIR patch

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@124 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b413b43a55581aae0e18f0de4e631aa4a9aedf6a..9148a67c2ed8835f5e0592e2afcec94ff3096816 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-09  Frank Reppin  <frank@opengroupware.org>
+
+       * GNUmakefile.postamble: added patch for installing in different
+         install roots (INSTALL_ROOT_DIR prefix variable) (v4.3.31)
+
 2004-09-08  Helge Hess  <helge.hess@opengroupware.org>
 
        * WOHttpAdaptor/WOHttpTransaction.m: check whether the simple HTTP

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.postamble b/sope-appserver/NGObjWeb/GNUmakefile.postamble
index 117255b03ea56ef7d471db8cd19b4770ef2e7526..e2db45d1f27ab5f2d382da1e155657cb6ccd474b 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.postamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.postamble
@@ -12,14 +12,16 @@ ngobjweb-resources : $(RESOURCES_DIR) $(libNGObjWeb_RESOURCES)
        fi)
 
 after-install :: ngobjweb-resources
-#      $(INSTALL_DATA) woapp.make wobundle.make $(GNUSTEP_MAKEFILES)
+#      $(INSTALL_DATA) woapp.make wobundle.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)
 
 after-install ::
-       $(MKDIRS) $(GNUSTEP_MAKEFILES)/Additional/
-       $(INSTALL_DATA) ngobjweb.make $(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
+       $(MKDIRS) $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/
+       $(INSTALL_DATA) ngobjweb.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
 
 ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
 after-install ::
-       $(INSTALL_DATA) woapp-gs.make    $(GNUSTEP_MAKEFILES)/woapp.make
-       $(INSTALL_DATA) wobundle-gs.make $(GNUSTEP_MAKEFILES)/wobundle.make
+       $(INSTALL_DATA) woapp-gs.make    \
+               $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make
+       $(INSTALL_DATA) wobundle-gs.make \
+               $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
 endif

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index cbfe80e99897d994600aefb1bd6cf67db6ab4aab..3bdd746f09cebab8e9d6a4ad1b6848774bc8a1b9 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=30
+SUBMINOR_VERSION:=31
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77