From 589a0469bfddb800638eb6f46e36e6a27ed128f1 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 9 Aug 2006 09:19:32 +0000 Subject: [PATCH] fixed a configure bug in combination with GS deployment roots git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1335 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3b8ef60a..da398b03 100755 --- a/configure +++ b/configure @@ -364,16 +364,16 @@ function genConfigMake() { # common.make cfgwrite "ifeq (\$(findstring _64, \$(GNUSTEP_HOST_CPU)), _64)" cfgwrite "CONFIGURE_64BIT:=yes" - cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)" - cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib64/" - cfgwrite "endif" - cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib64" + cfgwrite "CGS_LIBDIR_NAME:=lib64" cfgwrite "else" - cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)" - cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib/" + cfgwrite "CGS_LIBDIR_NAME:=lib" cfgwrite "endif" - cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib" + + 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)/" cfgwrite "# avoid a gstep-make warning" cfgwrite "PATH:=\$(GNUSTEP_SYSTEM_ROOT)/Tools:\$(PATH)" -- 2.39.5