Monotone-Parent: d8ee782e0279aa96226ceac45acca9d744f3f234

Monotone-Revision: 089ae441ff03d28570373f845e09e2601d6611ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-14T17:31:23
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,7 @@
+2008-02-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GNUmakefile: migrated to GNUstep Make 2.
+
 2008-02-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject

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

Main/SOGoProductLoader.m

@@ -80,28 +80,12 @@
 }
 
 - (void)_addGNUstepSearchPathesToArray:(NSMutableArray *)ma {
-  NSDictionary *env;
+  NSEnumerator *libraryPaths;
-  id tmp;
+  NSString *directory;
 
-  env = [[NSProcessInfo processInfo] environment];
+  libraryPaths = [NSStandardLibraryPaths() objectEnumerator];
-  if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil)
+  while ((directory = [libraryPaths nextObject]))
-    tmp = [env objectForKey:@"GNUSTEP_PATHLIST"];
+    [ma addObject: [directory stringByAppendingPathComponent:self->productDirectoryName]];
-  
-  tmp = [tmp componentsSeparatedByString:@":"];
-  if ([tmp count] > 0) {
-    NSEnumerator *e;
-      
-    e = [tmp objectEnumerator];
-    while ((tmp = [e nextObject])) {
-      tmp = [tmp stringByAppendingPathComponent:@"Library"];
-      tmp = [tmp stringByAppendingPathComponent:self->productDirectoryName];
-      if (![ma containsObject:tmp])
-        [ma addObject:tmp];
-    }
-  }
-  else {
-    NSLog(@"%s: empty library search path !", __PRETTY_FUNCTION__);
-  }
 }
 
 - (void)_addFHSPathesToArray:(NSMutableArray *)ma {
@@ -114,17 +98,12 @@
 
 - (NSArray *)productSearchPathes {
   NSMutableArray *ma;
-  BOOL hasGNUstepEnv;
   
   if (self->searchPathes != nil)
     return self->searchPathes;
 
-  hasGNUstepEnv = [[[[NSProcessInfo processInfo] environment]
-		     objectForKey:@"GNUSTEP_USER_ROOT"] length] > 0 ? YES : NO;
-  
   ma  = [NSMutableArray arrayWithCapacity:6];
   
-  if (hasGNUstepEnv)
   [self _addGNUstepSearchPathesToArray:ma];
 #if COCOA_Foundation_LIBRARY
   else

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

Protocols/GNUmakefile

@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../config.make
+include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECTS += \

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..		\

Protocols/iCalHTTP/GNUmakefile

@@ -26,4 +26,3 @@ ADDITIONAL_INCLUDE_DIRS += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

SOPE/GDLContentStore/GCSFolderType.m

@@ -64,7 +64,7 @@
   
   // TODO: fix me, GCS instead of OCS
   loc = [NGResourceLocator resourceLocatorForGNUstepPath:
-			     @"Library/OCSTypeModels"
+			     @"OCSTypeModels"
                            fhsPath:@"share/ocs"];
   return loc;
 }

SOPE/GDLContentStore/GNUmakefile

@@ -13,7 +13,8 @@ FRAMEWORK_NAME = GDLContentStore
 endif
 
 libGDLContentStore_PCH_FILE = common.h
-libGDLContentStore_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libGDLContentStore_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libGDLContentStore_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 libGDLContentStore_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 TOOL_NAME = gcs_ls gcs_mkdir gcs_cat gcs_recreatequick gcs_gensql
@@ -68,10 +69,12 @@ GDLContentStore_SUBPROJECTS  = $(libGDLContentStore_SUBPROJECTS)
 
 -include GNUmakefile.preamble
 ifneq ($(frameworks),yes)
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
-include fhs.make

SOPE/GDLContentStore/GNUmakefile.preamble

@@ -73,6 +73,6 @@ libGDLContentStore_PREBIND_ADDR="0xC7700000"
 libGDLContentStore_LDFLAGS += -seg1addr $(libGDLContentStore_PREBIND_ADDR)
 endif
 
-ifeq ($(findstring openbsd3, $(GNUSTEP_HOST_OS)), openbsd3)
+ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
 GCS_TOOL_LIBS += -liconv
 endif

SOPE/NGCards/GNUmakefile

@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ./Version
 
@@ -12,11 +12,10 @@ else
 FRAMEWORK_NAME = NGCards
 endif
 
-FHS_HEADER_DIRS = NGCards
-
 libNGCards_HEADER_FILES_DIR         = .
 libNGCards_HEADER_FILES_INSTALL_DIR = /NGCards
-libNGCards_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGCards_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGCards_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 libNGCards_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGCards_HEADER_FILES =  		\
@@ -118,10 +117,12 @@ NGCards_SUBPROJECTS  = $(libNGCards_SUBPROJECTS)
 
 -include GNUmakefile.preamble
 ifneq ($(frameworks),yes)
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 -include GNUmakefile.postamble
--include ../../fhslib.make

SOPE/NGCards/GNUmakefile.postamble

@@ -1,10 +1,6 @@
 # compilation settings
 
-ifeq ($(FHS_INSTALL_ROOT),)
+MAPDIR="$(SOPE_SAXMAPPINGS)"
-MAPDIR="$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/"
-else
-MAPDIR="$(FHS_INSTALL_ROOT)/share/sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxmappings/"
-endif
 
 mappings-dir ::
 	$(MKDIRS) $(MAPDIR)

SOPE/NGCards/versitCardsSaxDriver/GNUmakefile

@@ -1,12 +1,12 @@
 # GNUstep makefile
 
--include ../../../config.make
+include ../../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 -include ./Version
 
 BUNDLE_NAME        = versitCardsSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+BUNDLE_INSTALL_DIR = ${SOPE_SAXDRIVERS}/
 
 versitCardsSaxDriver_PRINCIPAL_CLASS = VSCardSaxDriver
 
@@ -22,4 +22,3 @@ versitCardsSaxDriver_RESOURCE_FILES = bundle-info.plist
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include fhs.make

SoObjects/Appointments/GNUmakefile

@@ -56,4 +56,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
 -include GNUmakefile.postamble
-include ../../fhswobundle.make

SoObjects/Contacts/GNUmakefile

@@ -26,4 +26,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

SoObjects/Mailer/GNUmakefile

@@ -52,4 +52,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

SoObjects/SOGo/GNUmakefile

@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 -include ../../Version
 -include ./Version
@@ -13,11 +13,11 @@ TOOL_NAME = \
 # 	agenor_emails4uid	\
 # 	agenor_defaults
 
-libSOGo_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGo_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGo_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 libSOGo_HEADER_FILES_DIR         = .
 libSOGo_HEADER_FILES_INSTALL_DIR = /SOGo
-FHS_HEADER_DIRS = SOGo
 
 libSOGo_HEADER_FILES = \
 	SOGoCache.h			\
@@ -107,8 +107,9 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include ../common.make
+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
--include ../../fhstools.make

SoObjects/SOGo/LDAPUserManager.m

@@ -80,7 +80,10 @@ static BOOL defaultMailDomainIsConfigured = NO;
   
   sourceID = [udSource objectForKey: @"id"];
   ldapSource = [LDAPSource sourceFromUDSource: udSource];
+  if (sourceID)
     [sources setObject: ldapSource forKey: sourceID];
+  else
+    NSLog(@"LDAPUserManager.m: WARNING: id field missing in a LDAP source, check the SOGoLDAPSources default");
   metadata = [NSMutableDictionary dictionary];
   value = [udSource objectForKey: @"canAuthenticate"];
   if (value)

SoObjects/SOGo/NSString+Utilities.h

@@ -48,6 +48,8 @@
 
 - (NSString *) asQPSubjectString: (NSString *) encoding;
 
+- (NSRange) _rangeOfURLInRange: (NSRange) refRange;
+
 #ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue;
 #endif

SoObjects/Sieve/GNUmakefile

@@ -19,4 +19,3 @@ Sieve_RESOURCE_FILES += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

SoObjects/common.make

@@ -1,12 +1,12 @@
 # common make file for SoObject 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)
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
 WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
 

UI/Common/GNUmakefile

@@ -41,4 +41,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/Contacts/GNUmakefile

@@ -39,4 +39,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/MailPartViewers/GNUmakefile

@@ -46,4 +46,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/MailerUI/GNUmakefile

@@ -55,4 +55,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/MainUI/GNUmakefile

@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../common.make
+include ../common.make
 
 BUNDLE_NAME = MainUI
 
@@ -32,4 +32,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/PreferencesUI/GNUmakefile

@@ -30,6 +30,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make
-
-

UI/SOGoElements/GNUmakefile

@@ -1,13 +1,11 @@
 # GNUstep makefile
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
-SOPE_VERSION = 4.7
-
 BUNDLE_NAME      = SOGoElements
 BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(SOPE_VERSION)/
+BUNDLE_INSTALL_DIR = $(SOPE_WOXBUILDERS)
 
 SOGoElements_PRINCIPAL_CLASS = SOGoElementsBundle
 
@@ -21,4 +19,3 @@ SOGoElements_OBJC_FILES = \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
--include fhs.make

UI/SOGoUI/GNUmakefile

@@ -10,7 +10,8 @@ LIBRARY_NAME = libSOGoUI
 
 libSOGoUI_HEADER_FILES_DIR         = .
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
-FHS_HEADER_DIRS = SOGoUI
+libSOGoUI_INTERFACE_VERSION	   = $(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGoUI_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 libSOGoUI_HEADER_FILES +=	\
 	\
@@ -33,6 +34,8 @@ libSOGoUI_OBJC_FILES +=		\
 # make
 
 -include GNUmakefile.preamble
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
--include ../../fhslib.make

UI/Scheduler/GNUmakefile

@@ -73,4 +73,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

UI/Templates/GNUmakefile

@@ -1,5 +1,7 @@
 # GNUstep makefile
 
+# include ../common.make
+
 XMLLINT = xmllint
 XMLLINT-BIN = $(shell which $(XMLLINT))
 ifeq ($(XMLLINT-BIN),)
@@ -10,15 +12,29 @@ all :: validate-wox
 endif
 
 WOXS = $(shell find . -name '*.wox' -type f)
+# TEMPLATE_FILES = $(shell ls *wox)
+# TEMPLATE_DIRS = ContactsUI \
+		MailPartViewers \
+		MailerUI 	\
+		MainUI 		\
+		PreferencesUI 	\
+		SchedulerUI
 
 validate-wox:
 	for wox in $(WOXS); \
 	  do $(XMLLINT-BIN) --noout $$wox || exit 1; \
 	done;
 
-install ::
+# install ::
+# 	mkdir -p ${SOGO_TEMPLATESDIR}
+# 	for TEMPLATE in $(TEMPLATE_FILES); do \
+# 		cp $$TEMPLATE ${SOGO_TEMPLATESDIR}; \
+# 	done;
+# 	for TEMPLATEDIR in $(TEMPLATE_DIRS); do \
+# 		cp -r $$TEMPLATEDIR ${SOGO_TEMPLATESDIR}; \
+# 	done;
 
-clean ::
+install clean ::
 
 distclean :: clean
 

UI/WebServerResources/GNUmakefile

@@ -0,0 +1,17 @@
+# GNUstep makefile
+
+include ../common.make
+
+WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *.jpg *gif *png *html *txt)
+
+all ::
+
+install ::
+	mkdir -p ${SOGO_WEBSERVERRESOURCESDIR}
+	cp $(WEBSERVER_RESOURCE_FILES) ${SOGO_WEBSERVERRESOURCESDIR}
+
+clean ::
+
+distclean :: clean
+
+uninstall ::

UI/common.make

@@ -1,12 +1,12 @@
 # common make file for UI bundles
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
-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..		\

configure

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Note: When adding make options to this script, ensure that the source still
@@ -14,7 +14,7 @@ CFG_ARGS="$0 $1 $2 $3 $4 $5 $6 $7 $8 $9"
 ARG_BEQUIET=0
 ARG_NOCREATE=0
 ARG_PREFIX=""
-ARG_GSMAKE="$GNUSTEP_MAKEFILES"
+ARG_GSMAKE=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null`
 ARG_CFGMAKE="$PWD/config.make"
 ARG_WITH_GNUSTEP=1
 ARG_WITH_DEBUG=1
@@ -23,12 +23,20 @@ ARG_WITH_STRIP=1
 DARG_GNUSTEP_SH="$ARG_GSMAKE/GNUstep.sh"
 DARG_IS_FHS=1
 
+# detect GNU make, needed at least on *BSD
+make -v 2>/dev/null | grep GNU >/dev/null 2>/dev/null
+if [ $? -eq 0 ];then
+  MAKE=make
+else
+  MAKE=gmake
+fi
+
 NGSTREAMS_DIR="./sope-core/NGStreams"
 LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib"
 
 # ******************** usage ********************
 
-function usage() {
+usage() {
   cat <<_ACEOF
 \`configure' configures a GNUstep-make based sourcetree for installation.
 
@@ -58,7 +66,7 @@ _ACEOF
 
 # ******************** running ********************
 
-function printParas() {
+printParas() {
   echo "Configuration:"
   if test $ARG_BEQUIET  = 1; then echo "  will be quite.";  fi
   if test $ARG_NOCREATE = 1; then echo "  won't create files"; fi
@@ -86,7 +94,7 @@ function printParas() {
   echo ""
 }
 
-function warnOnFHSPrefix() {
+warnOnFHSPrefix() {
   cat <<_ACEOFWARN
 Warning: you are configuring for a non standard FHS style prefix.
          prefix: $ARG_PREFIX
@@ -103,7 +111,7 @@ environment.
 _ACEOFWARN
 }
 
-function validateGNUstepArgs() {
+validateGNUstepArgs() {
   # GNUstep make
   if test "x$ARG_GSMAKE" = "x"; then
     if test -f $HOME/OGoRoot/Library/Makefiles/GNUstep.sh; then
@@ -133,7 +141,7 @@ function validateGNUstepArgs() {
   fi
 }
 
-function setupAppleArgs() {
+setupAppleArgs() {
   ARG_WITH_STRIP=0
   ARG_WITH_GNUSTEP=1
   
@@ -145,7 +153,7 @@ function setupAppleArgs() {
   fi
 }
 
-function validateArgs() {
+validateArgs() {
   # validate prefix (could be better?)
   case "x$ARG_PREFIX" in
     "x/usr/local"|"x/usr/local/")
@@ -195,7 +203,7 @@ function validateArgs() {
   fi
 }
 
-function printGNUstepSetup() {
+printGNUstepSetup() {
   echo "GNUstep environment:"
   echo "  system: ${GNUSTEP_SYSTEM_ROOT}"
   echo "  local:  ${GNUSTEP_LOCAL_ROOT}"
@@ -207,11 +215,11 @@ function printGNUstepSetup() {
   echo ""
 }
 
-function cfgwrite() {
+cfgwrite() {
   echo "$1" >> $ARG_CFGMAKE
 }
 
-function genConfigMake() {
+genConfigMake() {
   # we ignore the following vars also patches by gstep-make:
   #   PATH
   #   DYLD_LIBRARY_PATH
@@ -227,7 +235,7 @@ function genConfigMake() {
   cfgwrite ""
   
   cfgwrite "# Note: you can override any option as a 'make' parameter, eg:"
-  cfgwrite "#         make debug=yes"
+  cfgwrite "#         $MAKE debug=yes"
   cfgwrite ""
   
   #cfgwrite "# print on the cmdline that this file is being used"
@@ -235,7 +243,10 @@ function genConfigMake() {
   #cfgwrite "	@echo Local GNUstep config.make is active"
   #cfgwrite ""
 
-  # TODO: should be also write a GNUSTEP_INSTALLATION_DIR / BUNDLE_INSTALL_DIR?
+  cfgwrite "SOGO_MAJOR_VERSION=0"
+  cfgwrite "SOGO_MINOR_VERSION=9"
+  cfgwrite "SOPE_MAJOR_VERSION=4"
+  cfgwrite "SOPE_MINOR_VERSION=7"
   
   if test $DARG_IS_FHS = 1; then
     cfgwrite "# configured for FHS install"
@@ -251,6 +262,58 @@ function genConfigMake() {
     cfgwrite "debug:=no"
   fi
   cfgwrite ""
+  UNAME=`uname`
+  if [ "X${UNAME}" = "XLinux" ];then
+    UNAME=`uname -p`
+    if [ ${UNAME} = x86_64 -o ${UNAME} = sparc64 -o ${UNAME} = ppc64 ];then
+      cfgwrite "CGS_LIBDIR_NAME:=lib64"
+    else
+      cfgwrite "CGS_LIBDIR_NAME:=lib"
+    fi
+  else
+    cfgwrite "CGS_LIBDIR_NAME:=lib"
+  fi
+
+  cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)"
+  cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/\$(CGS_LIBDIR_NAME)/"
+#  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR)"
+  cfgwrite "endif"
+#  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L/usr/\$(CGS_LIBDIR_NAME)/"
+
+  if test $DARG_IS_FHS = 1; then
+    cfgwrite "# configured for FHS install"
+    cfgwrite "FHS_INSTALL_ROOT:=$ARG_PREFIX"
+    cfgwrite ""
+    cfgwrite "SOGO_SYSLIBDIR=\${DESTDIR}\${FHS_INSTALL_ROOT}/\${CGS_LIBDIR_NAME}"
+    cfgwrite "SOGO_LIBDIR=\${SOGO_SYSLIBDIR}/sogod-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
+    cfgwrite "SOPE_LIBDIR=\$(SOGO_SYSLIBDIR)/sope-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOGO_SYSSHAREDIR=\${DESTDIR}\${FHS_INSTALL_ROOT}/share"
+    cfgwrite "SOGO_SHARED=\${SOGO_SYSSHAREDIR}/sogo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
+    cfgwrite "SOPE_SHARED=\${SOGO_SYSSHAREDIR}/sope-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_SHARED}/templates"
+    cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_SHARED}/www"
+    cfgwrite "SOGO_TOOLS=\${DESTDIR}\${FHS_INSTALL_ROOT}/bin"
+    cfgwrite "SOGO_ADMIN_TOOLS=\${DESTDIR}\${FHS_INSTALL_ROOT}/sbin"
+    cfgwrite "SOPE_SAXMAPPINGS=\${SOPE_SHARED}/saxmappings"
+    cfgwrite "SOPE_SAXDRIVERS=\${SOPE_LIBDIR}/saxdrivers"
+    cfgwrite "SOPE_WOXBUILDERS=\${SOPE_LIBDIR}/wox-builders"
+    cfgwrite "SOGO_TYPEMODELS=\${SOGO_SYSSHAREDIR}/ocs"
+
+    cfgwrite ""
+  else
+    cfgwrite "# configured for GNUstep install"
+    cfgwrite ""
+    cfgwrite "SOGO_SYSLIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARIES}"
+    cfgwrite "SOGO_LIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
+    cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
+    cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
+    cfgwrite "SOGO_TOOLS=\${DESTDIR}/\${GNUSTEP_TOOLS}"
+    cfgwrite "SOGO_ADMIN_TOOLS=\${DESTDIR}/\${GNUSTEP_ADMIN_TOOLS}"
+    cfgwrite "SOPE_SAXMAPPINGS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxMappings"
+    cfgwrite "SOPE_SAXDRIVERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOPE_WOXBUILDERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+    cfgwrite "SOGO_TYPEMODELS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/OCSTypeModels"
+  fi
 
   if test $ARG_WITH_STRIP = 1; then
     cfgwrite "# configured to produce stripped code";
@@ -273,11 +336,9 @@ function genConfigMake() {
   cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
   cfgwrite ""
   
-  cfgwrite "# avoid a gstep-make warning"
-  cfgwrite "PATH:=\$(GNUSTEP_SYSTEM_ROOT)/Tools:\$(PATH)"
 }
 
-function checkLinking() {
+checkLinking() {
   local oldpwd=$PWD
   local tmpdir=".configure-test-$$"
   
@@ -294,7 +355,7 @@ function checkLinking() {
   echo >>$tmpmake "SYSTEM_LIB_DIR      += ${LINK_SYSLIBDIRS}"
   echo >>$tmpmake "include \$(GNUSTEP_MAKEFILES)/tool.make"
   
-  make -s messages=yes -f $tmpmake linktest >out.log 2>err.log
+  $MAKE -s messages=yes -f $tmpmake linktest >out.log 2>err.log
   LINK_RESULT=$?
 
   if test $LINK_RESULT = 0; then
@@ -313,12 +374,12 @@ function checkLinking() {
   rm -rf $tmpdir
 }
 
-function checkDependencies() {
+checkDependencies() {
   checkLinking "SaxObjC" required;
   checkLinking "NGLdap"  required;
 }
 
-function runIt() {
+runIt() {
   if test $ARG_BEQUIET != 1; then
     printParas;
   fi
@@ -346,11 +407,11 @@ function runIt() {
 
 # ******************** options ********************
 
-function extractFuncValue() {
+extractFuncValue() {
   VALUE="`echo "$1" | sed "s/[^=]*=//g"`"
 }
 
-function processOption() {
+processOption() {
   case "x$1" in
     "x--help"|"x-h")
 	usage;
@@ -401,7 +462,7 @@ done
 # load GNUstep environment
 validateGNUstepArgs
 # first we load the GNUstep.sh environment
-source $DARG_GNUSTEP_SH
+. $DARG_GNUSTEP_SH
 if test $ARG_BEQUIET != 1; then
   printGNUstepSetup;
 fi