added hack to install in FHS to WOXMl

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

diff --git a/sope-appserver/WOXML/ChangeLog b/sope-appserver/WOXML/ChangeLog
index 01a184db1c6a82023c18c54b90615c471b6b989a..2ba79d7228366d88a1754bd10aaf47c6d35f0941 100644 (file)
--- a/sope-appserver/WOXML/ChangeLog
+++ b/sope-appserver/WOXML/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-40  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.7)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * moved to SOPE 4.3 (v4.3.6)

diff --git a/sope-appserver/WOXML/GNUmakefile b/sope-appserver/WOXML/GNUmakefile
index c6a3c0ec2fe57b2e27d6155eb602300094a36e86..8e3bfd8939e1307e545dc8db8bcae05cf932b2fb 100644 (file)
--- a/sope-appserver/WOXML/GNUmakefile
+++ b/sope-appserver/WOXML/GNUmakefile
@@ -26,3 +26,4 @@ libWOXML_HEADER_FILES_INSTALL_DIR = /WOXML
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
+-include fhs.make

diff --git a/sope-appserver/WOXML/Version b/sope-appserver/WOXML/Version
index 0eb47da345be1d4c8ac5a363234ca3f2c77473cb..cab297dce179f93daddb8c8e20c17af86c0b5d3b 100644 (file)
--- a/sope-appserver/WOXML/Version
+++ b/sope-appserver/WOXML/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7

diff --git a/sope-appserver/WOXML/fhs.make b/sope-appserver/WOXML/fhs.make
new file mode 100644 (file)
index 0000000..5b5c08e
--- /dev/null
+++ b/sope-appserver/WOXML/fhs.make
@@ -0,0 +1,39 @@
+# 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/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+
+fhs-header-dirs ::
+       $(MKDIRS) $(FHS_INCLUDE_DIR)$(libWOXML_HEADER_FILES_INSTALL_DIR)
+
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(libWOXML_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(libWOXML_HEADER_FILES_INSTALL_DIR)/
+
+move-libs-to-fhs :: 
+       @echo "moving libs to $(FHS_LIB_DIR) .."
+       mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+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-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif