fixed FHS libdir

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

diff --git a/sope-gdl1/GDLAccess/fhs.make b/sope-gdl1/GDLAccess/fhs.make
index fde4ac11e80439bf34c46e1452469d1b4ca1b660..e0879982049ae5fb4e6d833b7058a95caa11d7c1 100644 (file)
--- a/sope-gdl1/GDLAccess/fhs.make
+++ b/sope-gdl1/GDLAccess/fhs.make
@@ -8,9 +8,9 @@ FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
 
 ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
 else
-SYSTEM_LIB_DIR += -L/usr/local/lib
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 endif
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"

diff --git a/sope-gdl1/GDLContentStore/fhs.make b/sope-gdl1/GDLContentStore/fhs.make
index c78c575ea8b3a5ffbbea2ac09051bff25631c372..f4caff91cd0ea08bd2cb4718a928f220e2b290ed 100644 (file)
--- a/sope-gdl1/GDLContentStore/fhs.make
+++ b/sope-gdl1/GDLContentStore/fhs.make
@@ -10,9 +10,9 @@ FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
 
 ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
 else
-SYSTEM_LIB_DIR += -L/usr/local/lib
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 endif
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"

diff --git a/sope-gdl1/MySQL/fhs.make b/sope-gdl1/MySQL/fhs.make
index 3e054e5f3542174b5ade020f341228b68958d010..d7a0a4d37d0027886cd6a62acaa7a50666eb9268 100644 (file)
--- a/sope-gdl1/MySQL/fhs.make
+++ b/sope-gdl1/MySQL/fhs.make
@@ -5,12 +5,10 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
 else
-SYSTEM_LIB_DIR += -L/usr/local/lib
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 endif
-
-
 FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/
 
 fhs-db-dirs ::

diff --git a/sope-gdl1/PostgreSQL/fhs.make b/sope-gdl1/PostgreSQL/fhs.make
index aae3415aa2f6ba7a01bc1bdbb4adac05521c38ec..01305296bf03f4c83bc42d45095fce13b4963349 100644 (file)
--- a/sope-gdl1/PostgreSQL/fhs.make
+++ b/sope-gdl1/PostgreSQL/fhs.make
@@ -5,9 +5,9 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
 else
-SYSTEM_LIB_DIR += -L/usr/local/lib
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 endif
 
 FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/