added FHS support for libGDLContentStore

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

diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile
index ceb9c888d853596574944124f9b4dde7f69431f7..6db00a8e07eff9e7f65550356bbdf5b06d595e05 100644 (file)
--- a/sope-gdl1/GDLAccess/GNUmakefile
+++ b/sope-gdl1/GDLAccess/GNUmakefile
@@ -126,4 +126,4 @@ include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
--include fhs.make
+include fhs.make

diff --git a/sope-gdl1/GDLContentStore/ChangeLog b/sope-gdl1/GDLContentStore/ChangeLog
index 6935d33c752c36fc3fd45444847440854e3bab0b..3803df16dd7d0e269a7072af83ae4665ffd1d51c 100644 (file)
--- a/sope-gdl1/GDLContentStore/ChangeLog
+++ b/sope-gdl1/GDLContentStore/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-21  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: added FHS support (v4.5.27)
+
 2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * moved OGoContentStore as GDLContentStore into sope-gdl1, removed 

diff --git a/sope-gdl1/GDLContentStore/GNUmakefile b/sope-gdl1/GDLContentStore/GNUmakefile
index 77de9121e9dc3ebb8306f5f1c3a8f72d15ff6aa5..527c0e5583297688f417eb9bbd418cc46fdc8720 100644 (file)
--- a/sope-gdl1/GDLContentStore/GNUmakefile
+++ b/sope-gdl1/GDLContentStore/GNUmakefile
@@ -5,11 +5,17 @@ include ../common.make
 -include ../Version
 include ./Version
 
+GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT}
+
 LIBRARY_NAME = libGDLContentStore
+libGDLContentStore_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libGDLContentStore_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+
 TOOL_NAME = gcs_ls gcs_mkdir gcs_cat gcs_recreatequick gcs_gensql
 
 libGDLContentStore_HEADER_FILES_DIR         = .
 libGDLContentStore_HEADER_FILES_INSTALL_DIR = /GDLContentStore
+FHS_HEADER_FILES_INSTALL_DIR = $(libGDLContentStore_HEADER_FILES_INSTALL_DIR)
 
 libGDLContentStore_HEADER_FILES +=             \
        NSURL+GCS.h                             \
@@ -48,3 +54,4 @@ gcs_recreatequick_OBJC_FILES += gcs_recreatequick.m
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+include fhs.make

diff --git a/sope-gdl1/GDLContentStore/Version b/sope-gdl1/GDLContentStore/Version
index 5c8341e668f7598ffaff52227e575ba218af45a5..6711565c8f4ac210a634591dfd6dc592d757f5f9 100644 (file)
--- a/sope-gdl1/GDLContentStore/Version
+++ b/sope-gdl1/GDLContentStore/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=26
+SUBMINOR_VERSION:=27
 
 # v4.5.26 does not require libNGiCal anymore
 # v0.9.19 requires libNGiCal       v4.5.40

diff --git a/sope-gdl1/GDLContentStore/fhs.make b/sope-gdl1/GDLContentStore/fhs.make
new file mode 100644 (file)
index 0000000..8e576cd
--- /dev/null
+++ b/sope-gdl1/GDLContentStore/fhs.make
@@ -0,0 +1,44 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+# NOTE: you need to define FHS_HEADER_FILES_INSTALL_DIR for one library
+
+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)$(FHS_HEADER_FILES_INSTALL_DIR)
+
+fhs-bin-dirs ::
+       $(MKDIRS) $(FHS_BIN_DIR)
+
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(FHS_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(FHS_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 move-tools-to-fhs
+
+after-install :: move-to-fhs
+
+endif