From 91629266a02ddbdd0bc9168ea31f32932e988043 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Thu, 13 Dec 2007 19:43:42 +0000 Subject: [PATCH] Small improvements to makefiles; use GNUSTEP_APPS instead of GNUSTEP_SYSTEM_ROOT/Applications when installing, and support non-flattened when linking git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@25731 72102866-910b-0410-8b05-ffd578937521 --- Documentation/ChangeLog | 7 +++++++ Modules/GNUmakefile.bundles | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index ed205d7..fa0dc7a 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -1,3 +1,10 @@ +2007-12-13 Nicola Pero + + * Modules/GNUmakefile.bundles (BUNDLE_INSTALL_DIR): Use + GNUSTEP_APPS, not GNUSTEP_SYSTEM_ROOT. + (ADDITIONAL_LIB_DIRS): Improved so that it should work on + non-flattened layouts as well. + 2007-12-13 Nicola Pero * GNUmakefile.preamble (ADDITIONAL_LIB_DIRS): Improved linking to diff --git a/Modules/GNUmakefile.bundles b/Modules/GNUmakefile.bundles index 30c9e21..6da79f5 100644 --- a/Modules/GNUmakefile.bundles +++ b/Modules/GNUmakefile.bundles @@ -5,9 +5,9 @@ ADDITIONAL_OBJCFLAGS += ADDITIONAL_CFLAGS += ADDITIONAL_CPPFLAGS += ADDITIONAL_INCLUDE_DIRS += -I../../../ -I../../../Headers -ADDITIONAL_LIB_DIRS += -L../../../Framework/ProjectCenter.framework/Versions/Current +ADDITIONAL_LIB_DIRS += -L../../../Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR) -BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources +BUNDLE_INSTALL_DIR = $(GNUSTEP_APPS)/ProjectCenter.app/Resources $(BUNDLE_NAME)_STANDARD_INSTALL = no DO_LIB_LINK=no @@ -18,7 +18,7 @@ ifeq ($(GNUSTEP_TARGET_OS), cygwin) DO_LIB_LINK=yes endif ifeq ($(DO_LIB_LINK), yes) - $(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Framework/ProjectCenter.framework + $(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR) $(GNUSTEP_INSTANCE)_BUNDLE_LIBS += -lProjectCenter endif