* gnustep-make 2 compatibility

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/branches/1.0-gsmake2@1350 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index 9feb7639e1b08919aa7c3bf712d386909f02e07a..0c0c13231dc7d78561fea0d89f411def00417372 100644 (file)
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../config.make
+include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 include ./Version
@@ -10,6 +10,7 @@ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
 
 SOGOD     = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
 TOOL_NAME = $(SOGOD)
+$(SOGOD)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
 
 # daemon tool
 all::
@@ -24,4 +25,3 @@ $(SOGOD)_OBJC_FILES += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
-include fhs.make

diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index a310e30696da126a7b97048866da109b317c262a..1ef0149f14e341d595f6b2133b15298db2abb436 100644 (file)
--- a/OGoContentStore/GNUmakefile
+++ b/OGoContentStore/GNUmakefile
@@ -1,17 +1,18 @@
 # GNUstep makefile
 
--include ../config.make
+include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ./Version
 
 LIBRARY_NAME = libOGoContentStore
 TOOL_NAME    = test_quick_extract
 
-TYPEMODELS_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/OCSTypeModels/
+TYPEMODELS_DIR = $(SOGO_TYPEMODELS)
 
 libOGoContentStore_HEADER_FILES_DIR         = .
 libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore
-# no headers, commented out: FHS_HEADER_DIRS = OGoContentStore
+libOGoContentStore_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libOGoContentStore_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 ADDITIONAL_INCLUDE_DIRS += -I../SOPE
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj
@@ -33,7 +34,9 @@ test_quick_extract_OBJC_FILES += \
        test_quick_extract.m
 
 -include GNUmakefile.preamble
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
--include ../fhslib.make

diff --git a/Protocols/GNUmakefile b/Protocols/GNUmakefile
index 25f185f51e8d4dc47888465a30e09bbad97f06fd..99a2a1bbbe8735424f8f044d7f3e97730d1fe452 100644 (file)
--- a/Protocols/GNUmakefile
+++ b/Protocols/GNUmakefile
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../config.make
+include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECTS += \

diff --git a/Protocols/common.make b/Protocols/common.make
index 03483a6d1287eb41240bbc2a0dd4d8a2bdf43129..03d2f33de0c32843a5e0eba11ac14a5de8d8188c 100644 (file)
--- a/Protocols/common.make
+++ b/Protocols/common.make
@@ -1,12 +1,12 @@
 # common make file for Protocol bundles
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..            \

diff --git a/Protocols/iCalHTTP/GNUmakefile b/Protocols/iCalHTTP/GNUmakefile
index 1467684a641bbfbe52779083a48cc98c135acf2a..e59e8c38fdf73ef1ed6ce5aae761880d52a5b211 100644 (file)
--- a/Protocols/iCalHTTP/GNUmakefile
+++ b/Protocols/iCalHTTP/GNUmakefile
@@ -26,4 +26,3 @@ ADDITIONAL_INCLUDE_DIRS += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make