mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 06:10:50 +00:00
Reverted usage of variables to install
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8630 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7242fb6d64
commit
a707bc8b0e
4 changed files with 17 additions and 17 deletions
|
@ -218,8 +218,8 @@ $(APP_DIR_NAME)/Resources:
|
|||
_FORCE::
|
||||
|
||||
internal-app-install:: internal-app-all internal-install-dirs
|
||||
$(REMOVE_INSTALLED_DIR) $(GNUSTEP_APPS)/$(APP_DIR_NAME)
|
||||
$(INSTALL_COMPLETE_DIR) $(APP_DIR_NAME) $(GNUSTEP_APPS)
|
||||
rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME)
|
||||
$(TAR) cf - $(APP_DIR_NAME) | (cd $(GNUSTEP_APPS); $(TAR) xf -)
|
||||
|
||||
internal-install-dirs::
|
||||
$(MKDIRS) $(GNUSTEP_APPS)
|
||||
|
|
|
@ -243,8 +243,8 @@ internal-bundle-install:: $(BUNDLE_INSTALL_DIR)
|
|||
done; \
|
||||
fi; \
|
||||
fi; \
|
||||
$(REMOVE_INSTALLED_DIR) $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)
|
||||
$(INSTALL_COMPLETE_DIR) $(BUNDLE_DIR_NAME) $(BUNDLE_INSTALL_DIR)
|
||||
rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)
|
||||
$(TAR) cf - $(BUNDLE_DIR_NAME) | (cd $(BUNDLE_INSTALL_DIR); $(TAR) xf -)
|
||||
|
||||
$(BUNDLE_DIR_NAME)/Resources $(BUNDLE_INSTALL_DIR)::
|
||||
@$(MKDIRS) $@
|
||||
|
|
|
@ -414,21 +414,21 @@ $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_
|
|||
echo "}") >$@
|
||||
|
||||
internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) $(GNUSTEP_FRAMEWORKS_LIBRARIES) $(GNUSTEP_FRAMEWORKS_HEADERS)
|
||||
$(REMOVE_INSTALLED_DIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
$(INSTALL_COMPLETE_DIR) $(FRAMEWORK_DIR_NAME) $(FRAMEWORK_INSTALL_DIR)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)
|
||||
@(cd $(GNUSTEP_FRAMEWORKS_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
if test -L "$(INTERNAL_framework_NAME)"; then \
|
||||
$(REMOVE_INSTALLED_LN_S) $(INTERNAL_framework_NAME); \
|
||||
rm -f $(INTERNAL_framework_NAME); \
|
||||
fi; \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)/Headers $(INTERNAL_framework_NAME); \
|
||||
fi;)
|
||||
@(cd $(GNUSTEP_FRAMEWORKS_LIBRARIES); \
|
||||
if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \
|
||||
$(REMOVE_INSTALLED_LN_S) $(FRAMEWORK_LIBRARY_FILE); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
fi; \
|
||||
if test -f "$(VERSION_FRAMEWORK_LIBRARY_FILE)"; then \
|
||||
$(REMOVE_INSTALLED_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \
|
||||
rm -f $(VERSION_FRAMEWORK_LIBRARY_FILE); \
|
||||
fi; \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) $(VERSION_FRAMEWORK_LIBRARY_FILE);)
|
||||
|
|
16
target.make
16
target.make
|
@ -105,8 +105,8 @@ SHARED_CFLAGS =
|
|||
SHARED_LIBEXT =
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
$(REMOVE_INSTALLED_LN_S) $(LIBRARY_FILE); \
|
||||
$(INSTALL_LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
HAVE_BUNDLES = no
|
||||
|
||||
####################################################
|
||||
|
@ -399,9 +399,9 @@ SHARED_FRAMEWORK_LINK_CMD = \
|
|||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
$(REMOVE_INSTALLED_LN_S) $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(INSTALL_LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(INSTALL_LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
)
|
||||
|
||||
OBJ_MERGE_CMD = \
|
||||
|
@ -815,9 +815,9 @@ SHARED_FRAMEWORK_LINK_CMD = \
|
|||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
$(REMOVE_INSTALLED_LN_S) $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(INSTALL_LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(INSTALL_LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
)
|
||||
|
||||
# was between the LN_S
|
||||
|
|
Loading…
Reference in a new issue