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
This commit is contained in:
Nicola Pero 2007-12-13 19:43:42 +00:00
parent b3d6df698d
commit 91629266a0
2 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2007-12-13 Nicola Pero <nicola@localhost.localdomain>
* 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 <nicola.pero@meta-innovation.com>
* GNUmakefile.preamble (ADDITIONAL_LIB_DIRS): Improved linking to

View file

@ -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