improved FHS installation

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@931 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/Main/ChangeLog b/Main/ChangeLog
index 601b58254965f73a6f60636dc8f26590b9df8278..72d4f0e924de85ae7c3ede305f9c83755f6569b7 100644 (file)
--- a/Main/ChangeLog
+++ b/Main/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-01  Helge Hess  <helge.hess@skyrix.com>
 
+       * GNUmakefile: added FHS installation of sogod-0.9 (v0.9.41)
+
        * SOGo.m: added class security declarations (previously in
          product.plist of MainUI), ensure that core SOGo SoClasses are loaded
          (v0.9.40)

diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index 9cd90c71452d65f3e43a3455d84daa2c8cf1149a..fbc5ae16e7c2eb48c15548f015008060baa4fd90 100644 (file)
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -18,3 +18,4 @@ $(SOGOD)_OBJC_FILES += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+include fhs.make

diff --git a/Main/Version b/Main/Version
index 7e0fcfa620d50b96d6135912702c321f66985015..21363f43a099ef0c56fc7c7285a1dd582a70a34e 100644 (file)
--- a/Main/Version
+++ b/Main/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=40
+SUBMINOR_VERSION:=41
 
 # v0.9.32 requires libSOGo         v0.9.57
 # v0.9.24 requires libWEExtensions v4.5.67

diff --git a/Main/fhs.make b/Main/fhs.make
new file mode 100644 (file)
index 0000000..c9cd79f
--- /dev/null
+++ b/Main/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_SBIN_DIR=$(FHS_INSTALL_ROOT)/sbin/
+
+fhs-bin-dirs ::
+       $(MKDIRS) $(FHS_SBIN_DIR)
+
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+move-daemons-to-fhs :: fhs-bin-dirs
+       @echo "moving daemons from $(NONFHS_BINDIR) to $(FHS_SBIN_DIR) .."
+       for i in $(TOOL_NAME); do \
+         mv "$(NONFHS_BINDIR)/$${i}" $(FHS_SBIN_DIR); \
+       done
+
+move-to-fhs :: move-daemons-to-fhs
+
+after-install :: move-to-fhs
+
+endif

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 40fb349586025e505baf9d7b2ae5b6e431919d7a..91d18420c13e061a44c6003c844b46508b1cbb3f 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-01  Helge Hess  <helge.hess@skyrix.com>
+
+       * added FHS installation (v0.9.32)
+
 2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * sql: added missing priority quickfield to SQLite tables (v0.9.31)

diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index b997ef8ef746795b4e3f518149f1ae5a9cc4d5f1..a6c7ab615d113a9d8631f2273ea5b701c1840fad 100644 (file)
--- a/OGoContentStore/GNUmakefile
+++ b/OGoContentStore/GNUmakefile
@@ -11,6 +11,7 @@ TYPEMODELS_DIR = $(GNUSTEP_USER_ROOT)/Library/OCSTypeModels/
 
 libOGoContentStore_HEADER_FILES_DIR         = .
 libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore
+# no headers, commented out: FHS_HEADER_DIRS = OGoContentStore
 
 libOGoContentStore_OBJC_FILES +=               \
        iCalEntityObject+OCS.m                  \
@@ -31,3 +32,4 @@ test_quick_extract_OBJC_FILES += \
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+-include ../fhslib.make

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index b33046f8b82102aad534372363fa24d671d00416..7481ab61d05614283d6ee3dcb64bc4e0e78981ce 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=31
+SUBMINOR_VERSION:=32
 
 # v0.9.30 requires libNGiCal          v4.5.48
 # v0.9.26 requires libGDLContentStore v4.5.26

diff --git a/SoObjects/SOGo/ChangeLog b/SoObjects/SOGo/ChangeLog
index 04a4b2e10cb1508cc5500127507d8b7d06bff162..e094bbb2e4c003e85b2c0b539ea60a8aa760a0a2 100644 (file)
--- a/SoObjects/SOGo/ChangeLog
+++ b/SoObjects/SOGo/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-01  Helge Hess  <helge.hess@skyrix.com>
 
+       * added FHS installation (v0.9.70)
+
        * SOGoObject.m: added class security declarations (previously in
          product.plist of MainUI) (v0.9.69)
 

diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index e9aeebd22ec6bf0385cb598f1d81fa506a413eba..f699f0f1969ba7fd0523683424f5c097a604f892 100644 (file)
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -17,6 +17,7 @@ libSOGo_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
 libSOGo_HEADER_FILES_DIR         = .
 libSOGo_HEADER_FILES_INSTALL_DIR = /SOGo
+FHS_HEADER_DIRS = SOGo
 
 libSOGo_HEADER_FILES = \
        SOGoObject.h                    \
@@ -73,3 +74,5 @@ agenor_defaults_OBJC_FILES   += agenor_defaults.m   $(COMMON_TOOL_FILES)
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+-include ../../fhslib.make
+-include ../../fhstools.make

diff --git a/SoObjects/SOGo/Version b/SoObjects/SOGo/Version
index 6741596789ebe542625e7cbd4ca12f554e68c007..ce940c852960338e0a8a0abfd584e17106f6465f 100644 (file)
--- a/SoObjects/SOGo/Version
+++ b/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=69
+SUBMINOR_VERSION:=70
 
 # v0.9.63 requires libNGiCal          v4.5.54
 # v0.9.60 requires libNGiCal          v4.5.49

diff --git a/UI/SOGoUI/ChangeLog b/UI/SOGoUI/ChangeLog
index b7b1ba988678f54ef350d48b92349a76196734bf..62fbca5df7052b63dfb1356f75089133621c7027 100644 (file)
--- a/UI/SOGoUI/ChangeLog
+++ b/UI/SOGoUI/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-01  Helge Hess  <helge.hess@skyrix.com>
+
+       * added FHS installation (v0.9.36)
+
 2005-07-30  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoDateFormatter.m: hardened against nil arguments (v0.9.35)

diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index ad2337d464b74aa8535eac77e4d2ef1cc55831f2..f8c064626af4602d0eca1a6bc4a1b9b40b6c9a04 100644 (file)
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -9,6 +9,7 @@ LIBRARY_NAME = libSOGoUI
 
 libSOGoUI_HEADER_FILES_DIR         = .
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
+FHS_HEADER_DIRS = SOGoUI
 
 libSOGoUI_HEADER_FILES +=      \
        UIxComponent.h          \
@@ -29,3 +30,4 @@ libSOGoUI_OBJC_FILES +=               \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
+-include ../../fhslib.make

diff --git a/UI/SOGoUI/Version b/UI/SOGoUI/Version
index 21352434eb4dbfa5f96b0648e03d1ce13eaa22f9..2a98c911ae579a416d27ffb4c60ac83d2a692f6c 100644 (file)
--- a/UI/SOGoUI/Version
+++ b/UI/SOGoUI/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=35
+SUBMINOR_VERSION:=36
 
 # v0.9.18 requires NGExtensions v4.5.136

diff --git a/fhstool.make b/fhstool.make
new file mode 100644 (file)
index 0000000..27c85d1
--- /dev/null
+++ b/fhstool.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