From f212a8e9b1d24338e4d154bcd64d029bd4f6aa40 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 1 Aug 2005 13:08:35 +0000 Subject: [PATCH] improved FHS installation git-svn-id: http://svn.opengroupware.org/SOGo/trunk@931 d1b88da0-ebda-0310-925b-ed51d893ca5b --- Main/ChangeLog | 2 ++ Main/GNUmakefile | 1 + Main/Version | 2 +- Main/fhs.make | 26 ++++++++++++++++++++++++++ OGoContentStore/ChangeLog | 4 ++++ OGoContentStore/GNUmakefile | 2 ++ OGoContentStore/Version | 2 +- SoObjects/SOGo/ChangeLog | 2 ++ SoObjects/SOGo/GNUmakefile | 3 +++ SoObjects/SOGo/Version | 2 +- UI/SOGoUI/ChangeLog | 4 ++++ UI/SOGoUI/GNUmakefile | 2 ++ UI/SOGoUI/Version | 2 +- fhstool.make | 26 ++++++++++++++++++++++++++ 14 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 Main/fhs.make create mode 100644 fhstool.make diff --git a/Main/ChangeLog b/Main/ChangeLog index 601b5825..72d4f0e9 100644 --- a/Main/ChangeLog +++ b/Main/ChangeLog @@ -1,5 +1,7 @@ 2005-08-01 Helge Hess + * 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 9cd90c71..fbc5ae16 100644 --- 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 7e0fcfa6..21363f43 100644 --- 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 index 00000000..c9cd79f8 --- /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 40fb3495..91d18420 100644 --- a/OGoContentStore/ChangeLog +++ b/OGoContentStore/ChangeLog @@ -1,3 +1,7 @@ +2005-08-01 Helge Hess + + * added FHS installation (v0.9.32) + 2005-07-26 Helge Hess * sql: added missing priority quickfield to SQLite tables (v0.9.31) diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index b997ef8e..a6c7ab61 100644 --- 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 b33046f8..7481ab61 100644 --- 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 04a4b2e1..e094bbb2 100644 --- a/SoObjects/SOGo/ChangeLog +++ b/SoObjects/SOGo/ChangeLog @@ -1,5 +1,7 @@ 2005-08-01 Helge Hess + * 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 e9aeebd2..f699f0f1 100644 --- 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 67415967..ce940c85 100644 --- 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 b7b1ba98..62fbca5d 100644 --- a/UI/SOGoUI/ChangeLog +++ b/UI/SOGoUI/ChangeLog @@ -1,3 +1,7 @@ +2005-08-01 Helge Hess + + * added FHS installation (v0.9.36) + 2005-07-30 Helge Hess * SOGoDateFormatter.m: hardened against nil arguments (v0.9.35) diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile index ad2337d4..f8c06462 100644 --- 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 21352434..2a98c911 100644 --- 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 index 00000000..27c85d13 --- /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 -- 2.39.5