From 69fa9c66d7917d7dbd2e13da0e0ffbd70c379c6c Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 21 Mar 2005 14:31:32 +0000
Subject: [PATCH] added FHS support for libGDLContentStore

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@683 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-gdl1/GDLAccess/GNUmakefile       |  2 +-
 sope-gdl1/GDLContentStore/ChangeLog   |  4 +++
 sope-gdl1/GDLContentStore/GNUmakefile |  7 +++++
 sope-gdl1/GDLContentStore/Version     |  2 +-
 sope-gdl1/GDLContentStore/fhs.make    | 44 +++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 sope-gdl1/GDLContentStore/fhs.make

diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile
index ceb9c888..6db00a8e 100644
--- 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 6935d33c..3803df16 100644
--- 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 77de9121..527c0e55 100644
--- 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 5c8341e6..6711565c 100644
--- 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
index 00000000..8e576cd0
--- /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
-- 
2.39.5