From df3877ec56bfc99113592840bf4e2a64a260b69f Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 9 Sep 2004 20:08:59 +0000 Subject: [PATCH] INSTALL_ROOT_DIR patch git-svn-id: http://svn.opengroupware.org/SOPE/trunk@124 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/GNUmakefile.postamble | 12 +++++++----- sope-appserver/NGObjWeb/Version | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index b413b43a..9148a67c 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Frank Reppin + + * GNUmakefile.postamble: added patch for installing in different + install roots (INSTALL_ROOT_DIR prefix variable) (v4.3.31) + 2004-09-08 Helge Hess * WOHttpAdaptor/WOHttpTransaction.m: check whether the simple HTTP diff --git a/sope-appserver/NGObjWeb/GNUmakefile.postamble b/sope-appserver/NGObjWeb/GNUmakefile.postamble index 117255b0..e2db45d1 100644 --- 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 cbfe80e9..3bdd746f 100644 --- 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 -- 2.39.5