added makefiles for FHS hack

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

diff --git a/sope-xml/DOM/ChangeLog b/sope-xml/DOM/ChangeLog
index bdf597e2250555bd2ee718f5efb6ccb0c7d9a8ba..6dd2a14124e80d6a883f606acbd3cc0e3f2d8882 100644 (file)
--- a/sope-xml/DOM/ChangeLog
+++ b/sope-xml/DOM/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * added hack to install the project in FHS locations - the library,
+         its headers, the tools and the resources will be installed in
+         FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+         (v4.3.13)
+
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>  
 
        * DOM.xcode: new Xcode project

diff --git a/sope-xml/DOM/GNUmakefile b/sope-xml/DOM/GNUmakefile
index 2ae78ba9d797e58d1d249a6bdf2bedfceaff72e4..bf0a9a214d364bce8a91352b2a7cc729a9901095 100644 (file)
--- a/sope-xml/DOM/GNUmakefile
+++ b/sope-xml/DOM/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include ../common.make
 
@@ -101,3 +101,4 @@ ifeq ($(FOUNDATION_LIB),apple)
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/DOM/Version b/sope-xml/DOM/Version
index 02dd0f66ab04ac6e6aa94378fa7704a16cec37a4..b16fefb9923ca4391b38158fc9efa6a03733ac71 100644 (file)
--- a/sope-xml/DOM/Version
+++ b/sope-xml/DOM/Version
@@ -1,3 +1,3 @@
 # $Id: Version 4 2004-08-20 17:04:31Z helge $
 
-SUBMINOR_VERSION:=12
+SUBMINOR_VERSION:=13

diff --git a/sope-xml/DOM/fhs.make b/sope-xml/DOM/fhs.make
new file mode 100644 (file)
index 0000000..c3eebae
--- /dev/null
+++ b/sope-xml/DOM/fhs.make
@@ -0,0 +1,30 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+       $(MKDIRS) $(FHS_INCLUDE_DIR)$(libDOM_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(libDOM_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(libDOM_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs :: 
+       @echo "moving libs to $(FHS_LIB_DIR) .."
+       mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/STXSaxDriver/ChangeLog b/sope-xml/STXSaxDriver/ChangeLog
index 57f4747c25442e5aa4e388279971174209dfbed2..a7d307167da822d4cf37bdca10c029c631261763 100644 (file)
--- a/sope-xml/STXSaxDriver/ChangeLog
+++ b/sope-xml/STXSaxDriver/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+       
+       * added hack to install the project in FHS locations - the SAX driver
+         will be installed in FHS_INSTALL_ROOT if specified (eg make
+         FHS_INSTALL_ROOT=/usr/local) (v1.0.9)
+       
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v1.0.8)

diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile
index b1e4b0c588475967e73d5bf222471ece5d5bed70..ec1d7e53bdf18cf037184ff50ec098c168bcea92 100644 (file)
--- a/sope-xml/STXSaxDriver/GNUmakefile
+++ b/sope-xml/STXSaxDriver/GNUmakefile
@@ -19,3 +19,4 @@ STXSaxDriver_RESOURCE_FILES += Version
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/STXSaxDriver/Version b/sope-xml/STXSaxDriver/Version
index fa740e0292b6d0446a6c1d797716345fe9fcea62..2361ba46d65b2d409a8b9fc263a5e37d84535b7f 100644 (file)
--- a/sope-xml/STXSaxDriver/Version
+++ b/sope-xml/STXSaxDriver/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=1
 MINOR_VERSION=0
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9

diff --git a/sope-xml/STXSaxDriver/fhs.make b/sope-xml/STXSaxDriver/fhs.make
new file mode 100644 (file)
index 0000000..ebaa53a
--- /dev/null
+++ b/sope-xml/STXSaxDriver/fhs.make
@@ -0,0 +1,25 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_SAX_DIR=$(FHS_LIB_DIR)sope-4.3/saxdrivers/
+
+fhs-sax-dirs ::
+       $(MKDIRS) $(FHS_SAX_DIR)
+
+move-bundles-to-fhs :: fhs-sax-dirs
+       @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_SAX_DIR) .."
+       for i in $(BUNDLE_NAME); do \
+          j="$(FHS_SAX_DIR)/$${i}$(BUNDLE_EXTENSION)"; \
+         if test -d $$j; then rm -r $$j; fi; \
+         mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \
+       done
+
+move-to-fhs :: move-bundles-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog
index 92029c1a7cf9f88899daecc3b2d4ce8318368c32..220dc806c423cce7290543247ffc7b8134596e7d 100644 (file)
--- a/sope-xml/SaxObjC/ChangeLog
+++ b/sope-xml/SaxObjC/ChangeLog
@@ -1,3 +1,17 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v4.3.41
+
+       * SaxXMLReaderFactory.m: look in /usr/local/lib/sope-4.3/saxdrivers/
+         and /usr/lib/sope-4.3/saxdrivers/ for SAX drivers
+         
+       * SaxObjectModel.m: also look in /usr/local/share/sope-4.3/saxmappings/
+         and /usr/share/sope-4.3/saxmappings/ for models
+
+       * added hack to install the project in FHS locations - the library,
+         its headers, the tools and the resources will be installed in
+         FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SaxObjC.xcode: new Xcode project

diff --git a/sope-xml/SaxObjC/GNUmakefile b/sope-xml/SaxObjC/GNUmakefile
index b9e7542cfa36ab87bce7279db82ddeeda80fe76c..4ed4314881258ad852ddd47b2451d0b0b98935be 100644 (file)
--- a/sope-xml/SaxObjC/GNUmakefile
+++ b/sope-xml/SaxObjC/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include ../common.make
 
@@ -62,3 +62,4 @@ ifeq ($(FOUNDATION_LIB),apple)
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/SaxObjC/SaxObjectModel.m b/sope-xml/SaxObjC/SaxObjectModel.m
index df3a58a048ae7588cb910209e1cd3b7a9ab95e30..7c8f1d7cee3a251e1d9dab33ee8edf9a12297046 100644 (file)
--- a/sope-xml/SaxObjC/SaxObjectModel.m
+++ b/sope-xml/SaxObjC/SaxObjectModel.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SaxObjectModel.h"
 #include "common.h"
@@ -83,15 +82,15 @@ static NSArray *searchPathes = nil;
           [ma addObject:tmp];
       }
     }
-    else {
-      NSLog(@"%s: empty library search path !", __PRETTY_FUNCTION__);
-    }
 #endif
     
+    /* FHS fallback */
+    [ma addObject:@"/usr/local/share/sope-4.3/saxmappings/"];
+    [ma addObject:@"/usr/share/sope-4.3/saxmappings/"];
     searchPathes = [ma copy];
     
     if ([searchPathes count] == 0)
-      NSLog(@"%s: no search pathes were found !", __PRETTY_FUNCTION__);
+      NSLog(@"%s: no search pathes were found!", __PRETTY_FUNCTION__);
   }
   return searchPathes;
 }

diff --git a/sope-xml/SaxObjC/SaxXMLReaderFactory.m b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
index 7a6098e0599b2781b6fe3fc00d83c75a61e09688..d02737329effd5ffd49e9b871bc888eaeee09cd7 100644 (file)
--- a/sope-xml/SaxObjC/SaxXMLReaderFactory.m
+++ b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SaxXMLReaderFactory.h"
 #include "common.h"
@@ -103,7 +102,7 @@ static id      factory       = nil;
 #endif
 #else
   env = [[NSProcessInfo processInfo] environment];
-
+  
   if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil)
     tmp = [env objectForKey:@"GNUSTEP_PATHLIST"];
   tmp = [tmp componentsSeparatedByString:@":"];
@@ -117,15 +116,15 @@ static id      factory       = nil;
           [ma addObject:tmp];
       }
   }
-  else {
-    NSLog(@"%s: empty library search path !", __PRETTY_FUNCTION__);
-  }
 #endif
-    
+  
+  /* FHS fallback */
+  [ma addObject:@"/usr/local/lib/sope-4.3/saxdrivers/"];
+  [ma addObject:@"/usr/lib/sope-4.3/saxdrivers/"];
   searchPathes = [ma copy];
-    
+  
   if ([searchPathes count] == 0)
-    NSLog(@"%s: no search pathes were found !", __PRETTY_FUNCTION__);
+    NSLog(@"%s: no search pathes were found!", __PRETTY_FUNCTION__);
   
   return searchPathes;
 }

diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version
index d3d7995a946cb8741ec4e7a9dcf1b0a92263088a..b64cd5801f8619965d88b347e58edfa46efd36d2 100644 (file)
--- a/sope-xml/SaxObjC/Version
+++ b/sope-xml/SaxObjC/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=40
+SUBMINOR_VERSION:=41

diff --git a/sope-xml/SaxObjC/fhs.make b/sope-xml/SaxObjC/fhs.make
new file mode 100644 (file)
index 0000000..6668d62
--- /dev/null
+++ b/sope-xml/SaxObjC/fhs.make
@@ -0,0 +1,30 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+       $(MKDIRS) $(FHS_INCLUDE_DIR)$(libSaxObjC_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(libSaxObjC_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(libSaxObjC_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs :: 
+       @echo "moving libs to $(FHS_LIB_DIR) .."
+       mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog
index aa68cf9abfc495b26cd071520af00dd499894ecf..88ac496a324e71c08cb3264825e91efb4480d333 100644 (file)
--- a/sope-xml/XmlRpc/ChangeLog
+++ b/sope-xml/XmlRpc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * added hack to install the project in FHS locations - the library,
+         its headers, the tools and the resources will be installed in
+         FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+         (v4.3.23)
+
 2004-08-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * XmlRpc.xcode: moved unused source into Unused group. Fixed

diff --git a/sope-xml/XmlRpc/GNUmakefile b/sope-xml/XmlRpc/GNUmakefile
index 927f5e04452282f88ff7a0779e2865b9dbc535c0..3e409be8edd5a123a681850177520bf14c076331 100644 (file)
--- a/sope-xml/XmlRpc/GNUmakefile
+++ b/sope-xml/XmlRpc/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include ../common.make
 
@@ -47,3 +47,4 @@ ifeq ($(FOUNDATION_LIB),apple)
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/XmlRpc/Version b/sope-xml/XmlRpc/Version
index 78237daff645932d2dc39c82a83a2f6fffffed9c..75e491757d51d4b9ee28082b6c763da900233ff5 100644 (file)
--- a/sope-xml/XmlRpc/Version
+++ b/sope-xml/XmlRpc/Version
@@ -1,3 +1,3 @@
-# $Id$
+# $Id: Version 4 2004-08-20 17:04:31Z helge $
 
-SUBMINOR_VERSION:=22
+SUBMINOR_VERSION:=23

diff --git a/sope-xml/XmlRpc/fhs.make b/sope-xml/XmlRpc/fhs.make
new file mode 100644 (file)
index 0000000..a8fd63e
--- /dev/null
+++ b/sope-xml/XmlRpc/fhs.make
@@ -0,0 +1,30 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+       $(MKDIRS) $(FHS_INCLUDE_DIR)$(libXmlRpc_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(libXmlRpc_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(libXmlRpc_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs :: 
+       @echo "moving libs to $(FHS_LIB_DIR) .."
+       mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index e24891436ca1d8c82af95dfe2934a2f24fe8e6f7..094dd5b7b2229ba8f638a957b85b7d6d9a591a4d 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+       
+       * added hack to install the project in FHS locations - the SAX driver
+         will be installed in FHS_INSTALL_ROOT if specified (eg make
+         FHS_INSTALL_ROOT=/usr/local) (v4.3.17)
+       
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * libxmlSAXDriver.xcode: new Xcode project

diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile
index 71646f8d5e8ceca251ce5522cbc27107f9d17a9d..0b193235afb7bbb38376ba487464c1209e217a78 100644 (file)
--- a/sope-xml/libxmlSAXDriver/GNUmakefile
+++ b/sope-xml/libxmlSAXDriver/GNUmakefile
@@ -19,14 +19,4 @@ libxmlSAXDriver_LOCALIZED_RESOURCE_FILES =
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-after-all ::
-       @(cp bundle-info.plist \
-         $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION))
-else
-after-all ::
-       @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\
-         cp ../bundle-info.plist .)
-endif
+-include fhs.make

diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile.postamble b/sope-xml/libxmlSAXDriver/GNUmakefile.postamble
new file mode 100644 (file)
index 0000000..b7bd25b
--- /dev/null
+++ b/sope-xml/libxmlSAXDriver/GNUmakefile.postamble
@@ -0,0 +1,11 @@
+# postprocessing
+
+ifneq ($(GNUSTEP_BUILD_DIR),)
+after-all ::
+       @(cp bundle-info.plist \
+         $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION))
+else
+after-all ::
+       @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\
+         cp ../bundle-info.plist .)
+endif

diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version
index 30986027db5373739b686e44c443ef12043cb73a..c74af8851c4f0edc37d5f611a0ab55b743d23032 100644 (file)
--- a/sope-xml/libxmlSAXDriver/Version
+++ b/sope-xml/libxmlSAXDriver/Version
@@ -1,3 +1,3 @@
 # version
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17

diff --git a/sope-xml/libxmlSAXDriver/fhs.make b/sope-xml/libxmlSAXDriver/fhs.make
new file mode 100644 (file)
index 0000000..ebaa53a
--- /dev/null
+++ b/sope-xml/libxmlSAXDriver/fhs.make
@@ -0,0 +1,25 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_SAX_DIR=$(FHS_LIB_DIR)sope-4.3/saxdrivers/
+
+fhs-sax-dirs ::
+       $(MKDIRS) $(FHS_SAX_DIR)
+
+move-bundles-to-fhs :: fhs-sax-dirs
+       @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_SAX_DIR) .."
+       for i in $(BUNDLE_NAME); do \
+          j="$(FHS_SAX_DIR)/$${i}$(BUNDLE_EXTENSION)"; \
+         if test -d $$j; then rm -r $$j; fi; \
+         mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \
+       done
+
+move-to-fhs :: move-bundles-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/pyxSAXDriver/ChangeLog b/sope-xml/pyxSAXDriver/ChangeLog
index 5cafdd1ba3834e00e81025632b9c3ef5bf228089..c813d48d7e92fe9baa8e4d2ba05c5462ed5a6aea 100644 (file)
--- a/sope-xml/pyxSAXDriver/ChangeLog
+++ b/sope-xml/pyxSAXDriver/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+       
+       * added hack to install the project in FHS locations - the SAX driver
+         will be installed in FHS_INSTALL_ROOT if specified (eg make
+         FHS_INSTALL_ROOT=/usr/local)
+       
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile
index 67a95f98a11bda13dc98dc5fa892132582e4c4b8..4ee51ff26a914ca6f0d34f16fba1a7252b0c42fb 100644 (file)
--- a/sope-xml/pyxSAXDriver/GNUmakefile
+++ b/sope-xml/pyxSAXDriver/GNUmakefile
@@ -8,27 +8,7 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers-4.3/
 
 pyxSAXDriver_OBJC_FILES = pyxSAXDriver.m
 
-pyxSAXDriver_BUNDLE_LIBS += -lSaxObjC
-
-ifeq ($(GNUSTEP_TARGET_OS),cygwin32)
-pyxSAXDriver_BUNDLE_LIBS += \
-       -lFoundation -lobjc
-endif
-
-pyxSAXDriver_RESOURCE_FILES = bundle-info.plist
-pyxSAXDriver_LOCALIZED_RESOURCE_FILES =
-
-ADDITIONAL_INCLUDE_DIRS += -I.. -I../..
-ADDITIONAL_LIB_DIRS     += -L../SaxObjC/$(GNUSTEP_OBJ_DIR)
-
+-include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-after-all ::
-       @(cp bundle-info.plist \
-         $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION))
-else
-after-all ::
-       @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\
-         cp ../bundle-info.plist .)
-endif
+-include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile.postamble b/sope-xml/pyxSAXDriver/GNUmakefile.postamble
new file mode 100644 (file)
index 0000000..b7bd25b
--- /dev/null
+++ b/sope-xml/pyxSAXDriver/GNUmakefile.postamble
@@ -0,0 +1,11 @@
+# postprocessing
+
+ifneq ($(GNUSTEP_BUILD_DIR),)
+after-all ::
+       @(cp bundle-info.plist \
+         $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION))
+else
+after-all ::
+       @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\
+         cp ../bundle-info.plist .)
+endif

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile.preamble b/sope-xml/pyxSAXDriver/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..5afdc3f
--- /dev/null
+++ b/sope-xml/pyxSAXDriver/GNUmakefile.preamble
@@ -0,0 +1,14 @@
+# compilation settings
+
+pyxSAXDriver_BUNDLE_LIBS += -lSaxObjC
+
+ifeq ($(GNUSTEP_TARGET_OS),cygwin32)
+pyxSAXDriver_BUNDLE_LIBS += \
+       -lFoundation -lobjc
+endif
+
+pyxSAXDriver_RESOURCE_FILES = bundle-info.plist
+pyxSAXDriver_LOCALIZED_RESOURCE_FILES =
+
+ADDITIONAL_INCLUDE_DIRS += -I.. -I../..
+ADDITIONAL_LIB_DIRS     += -L../SaxObjC/$(GNUSTEP_OBJ_DIR)

diff --git a/sope-xml/pyxSAXDriver/fhs.make b/sope-xml/pyxSAXDriver/fhs.make
new file mode 100644 (file)
index 0000000..ebaa53a
--- /dev/null
+++ b/sope-xml/pyxSAXDriver/fhs.make
@@ -0,0 +1,25 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_SAX_DIR=$(FHS_LIB_DIR)sope-4.3/saxdrivers/
+
+fhs-sax-dirs ::
+       $(MKDIRS) $(FHS_SAX_DIR)
+
+move-bundles-to-fhs :: fhs-sax-dirs
+       @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_SAX_DIR) .."
+       for i in $(BUNDLE_NAME); do \
+          j="$(FHS_SAX_DIR)/$${i}$(BUNDLE_EXTENSION)"; \
+         if test -d $$j; then rm -r $$j; fi; \
+         mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \
+       done
+
+move-to-fhs :: move-bundles-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/sope-xml/samples/GNUmakefile b/sope-xml/samples/GNUmakefile
index 4732305d8c1263c5a95dbe05d498edcfbf022357..0165d9d2633ba0e7e6eb0e5ccf9cbc8ebd7e22b2 100644 (file)
--- a/sope-xml/samples/GNUmakefile
+++ b/sope-xml/samples/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -47,3 +47,4 @@ endif
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-xml/samples/fhs.make b/sope-xml/samples/fhs.make
new file mode 100644 (file)
index 0000000..27c85d1
--- /dev/null
+++ b/sope-xml/samples/fhs.make
@@ -0,0 +1,26 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-bin-dirs ::
+       $(MKDIRS) $(FHS_BIN_DIR)
+
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+move-tools-to-fhs :: fhs-bin-dirs
+       @echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .."
+       for i in $(TOOL_NAME); do \
+         mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
+       done
+
+move-to-fhs :: move-tools-to-fhs
+
+after-install :: move-to-fhs
+
+endif