From b53a04e09f39b970c152b1a8b43bcd248b44c222 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 4 Jul 2006 01:15:01 +0000
Subject: [PATCH] fixed FHS libdir

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1304 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-gdl1/GDLAccess/fhs.make       | 4 ++--
 sope-gdl1/GDLContentStore/fhs.make | 4 ++--
 sope-gdl1/MySQL/fhs.make           | 6 ++----
 sope-gdl1/PostgreSQL/fhs.make      | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/sope-gdl1/GDLAccess/fhs.make b/sope-gdl1/GDLAccess/fhs.make
index fde4ac11..e0879982 100644
--- 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 c78c575e..f4caff91 100644
--- 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 3e054e5f..d7a0a4d3 100644
--- 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 aae3415a..01305296 100644
--- 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/
-- 
2.39.5