gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recognize xxx_INSTALL_DIR

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@18426 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2004-01-16 17:04:48 +00:00
parent 9aba042a40
commit ea56446d4e
12 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Fri Jan 16 17:01:55 2004 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/bundle.make: Recognize xxx_INSTALL_DIR and use it if
set.
* Instance/clibrary.make: Same change.
* Instance/ctool.make: Same change.
* Instance/framework.make: Same change.
* Instance/gswbundle.make: Same change.
* Instance/java.make: Same change.
* Instance/library.make: Same change.
* Instance/objc.make: Same change.
* Instance/palette.make: Same change.
* Instance/service.make: Same change.
* Instance/tool.make: Same change.
2004-01-15 Adam Fedor <fedor@gnu.org>
* configure.ac: Add check for Apple cc

7
Instance/bundle.make
View file

@ -114,6 +114,13 @@ ifneq ($(OBJ_FILES_TO_LINK),)
BUNDLE_FILE = $(GNUSTEP_BUILD_DIR)/$(BUNDLE_FILE_NAME)
endif
#
# Determine where to install. By default, install into GNUSTEP_BUNDLES.
#
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
BUNDLE_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(BUNDLE_INSTALL_DIR),)
BUNDLE_INSTALL_DIR = $(GNUSTEP_BUNDLES)
endif

4
Instance/clibrary.make
View file

@ -44,6 +44,10 @@
internal-clibrary-uninstall_
# This is the directory where the lib get installed.
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
CLIBRARY_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(CLIBRARY_INSTALL_DIR),)
CLIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES)
endif

4
Instance/ctool.make
View file

@ -33,6 +33,10 @@ endif
# This is the directory where the ctools get installed. If you don't
# specify a directory they will get installed in the GNUstep Local
# root.
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
CTOOL_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(CTOOL_INSTALL_DIR),)
CTOOL_INSTALL_DIR = $(GNUSTEP_TOOLS)
endif

4
Instance/framework.make
View file

@ -181,6 +181,10 @@ ifeq ($(WITH_DLL),yes)
FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT)
endif # WITH_DLL
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
FRAMEWORK_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(FRAMEWORK_INSTALL_DIR),)
FRAMEWORK_INSTALL_DIR = $(GNUSTEP_FRAMEWORKS)
endif

4
Instance/gswbundle.make
View file

@ -46,6 +46,10 @@ endif
GSWBUNDLE_LD = $(BUNDLE_LD)
GSWBUNDLE_LDFLAGS = $(BUNDLE_LDFLAGS)
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
GSWBUNDLE_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(GSWBUNDLE_INSTALL_DIR),)
GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
endif

4
Instance/java.make
View file

@ -66,6 +66,10 @@ endif
#
# For backwards compatibility ... will be removed!
#
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
JAVA_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifneq ($(JAVA_INSTALLATION_DIR),)
JAVA_INSTALL_DIR = $(JAVA_INSTALLATION_DIR)
endif

4
Instance/library.make
View file

@ -50,6 +50,10 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
# This is the directory where the libs get installed. This should *not*
# include the target arch, os directory or library_combo.
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
LIBRARY_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(LIBRARY_INSTALL_DIR),)
LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES)
endif

4
Instance/objc.make
View file

@ -37,6 +37,10 @@ endif
# This is the directory where the objc programs get installed. If you
# don't specify a directory they will get installed in the Tools
# directory in GNUSTEP_LOCAL_ROOT.
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
OBJC_PROGRAM_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(OBJC_PROGRAM_INSTALL_DIR),)
OBJC_PROGRAM_INSTALL_DIR = $(GNUSTEP_TOOLS)
endif

4
Instance/palette.make
View file

@ -59,6 +59,10 @@ PALETTE_DIR = $(GNUSTEP_BUILD_DIR)/$(PALETTE_DIR_NAME)
PALETTE_FILE_NAME = $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME)
PALETTE_FILE = $(GNUSTEP_BUILD_DIR)/$(PALETTE_FILE_NAME)
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
PALETTE_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(PALETTE_INSTALL_DIR),)
PALETTE_INSTALL_DIR = $(GNUSTEP_PALETTES)
endif

4
Instance/service.make
View file

@ -61,6 +61,10 @@ SERVICE_DIR = $(GNUSTEP_BUILD_DIR)/$(SERVICE_DIR_NAME)
SERVICE_FILE_NAME = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)
SERVICE_FILE = $(GNUSTEP_BUILD_DIR)/$(SERVICE_FILE_NAME)
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
SERVICE_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(SERVICE_INSTALL_DIR),)
SERVICE_INSTALL_DIR = $(GNUSTEP_SERVICES)
endif

4
Instance/tool.make
View file

@ -37,6 +37,10 @@ endif
# This is the directory where the tools get installed. If you don't specify a
# directory they will get installed in the GNUstep Local Root.
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
TOOLD_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifeq ($(TOOL_INSTALL_DIR),)
TOOL_INSTALL_DIR = $(GNUSTEP_TOOLS)
endif