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

Added variable FINAL_LIBRARY_INSTALL_DIR; use it everywhere

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@11221 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-10-23 09:55:21 +00:00
parent 7c19e38d38
commit 17ad7d6379
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clibrary.make
View file

@ -93,6 +93,11 @@ ifeq ($(CLIBRARY_INSTALL_DIR),)
CLIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES)
endif
# And this is used internally - it is the final directory where we put
# the library - it includes target arch, os dir but not the
# library_combo - this variable is PRIVATE to gnustep-make
FINAL_LIBRARY_INSTALL_DIR = $(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)
ifeq ($(shared), yes)
ifneq ($(BUILD_DLL),yes)
@ -207,14 +212,14 @@ internal-clibrary-install:: internal-install-dirs \
internal-install-headers
# Depend on creating all the dirs
internal-install-dirs:: $(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR) \
internal-install-dirs:: $(FINAL_LIBRARY_INSTALL_DIR) \
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR) \
$(DLL_INSTALLATION_DIR) \
$(ADDITIONAL_INSTALL_DIRS)
# Now the rule to create each dir. NB: Nothing gets executed if the dir
# already exists
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR):
$(FINAL_LIBRARY_INSTALL_DIR):
$(MKDIRS) $@
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR):
@ -246,7 +251,7 @@ internal-install-lib::
fi
if [ -f $(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) ]; then \
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) \
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR) ; \
$(FINAL_LIBRARY_INSTALL_DIR) ; \
fi
else
@ -254,7 +259,7 @@ else
internal-install-lib::
if [ -f $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) ]; then \
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR) ; \
$(FINAL_LIBRARY_INSTALL_DIR) ; \
$(AFTER_INSTALL_LIBRARY_CMD) \
fi
@ -274,14 +279,14 @@ ifeq ($(BUILD_DLL),yes)
internal-uninstall-lib::
rm -f $(DLL_INSTALLATION_DIR)/$(DLL_NAME) \
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(DLL_EXP_LIB)
$(FINAL_LIBRARY_INSTALL_DIR)/$(DLL_EXP_LIB)
else
internal-uninstall-lib::
rm -f $(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(VERSION_LIBRARY_FILE) \
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_FILE)\
$(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(SONAME_LIBRARY_FILE)
rm -f $(FINAL_LIBRARY_INSTALL_DIR)/$(VERSION_LIBRARY_FILE) \
$(FINAL_LIBRARY_INSTALL_DIR)/$(LIBRARY_FILE)\
$(FINAL_LIBRARY_INSTALL_DIR)/$(SONAME_LIBRARY_FILE)
endif
#