Standardized usage of HEADER_FILES_INSTALL_DIR which should not need a '/'

in the user makefile


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@11709 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-12-12 13:20:53 +00:00
parent 04efc19a24
commit e682895006
5 changed files with 25 additions and 11 deletions

View file

@ -1,3 +1,17 @@
Wed Dec 12 11:15:13 2001 Nicola Pero <n.pero@mi.flashnet.it>
* bundle.make (internal-bundle-install): Added a '/' between
GNUSTEP_HEADERS and HEADER_FILES_INSTALL_DIR.
(internal-bundle-uninstall): Idem.
* framework.make (internal-framework-uninstall): Idem.
* gswbundle.make (internal-bundle-install): Idem.
(internal-bundle-uninstall): Idem.
* subproject.make
($(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)): Idem.
(internal-install-headers): Idem.
(internal-subproject-install): Idem.
(internal-subproject-uninstall): Idem.
Wed Dec 12 11:07:41 2001 Nicola Pero <n.pero@mi.flashnet.it>
* gswbundle.make (internal-bundle-install): Removed MKDIRS

View file

@ -286,12 +286,12 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
internal-bundle-install:: $(BUNDLE_INSTALL_DIR)
ifneq ($(HEADER_FILES_INSTALL_DIR),)
$(MKDIRS) $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR);
$(MKDIRS) $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR);
ifneq ($(HEADER_FILES),)
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done;
endif
@ -315,7 +315,7 @@ internal-bundle-uninstall::
ifneq ($(HEADER_FILES),)
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
rm -rf $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done;
endif

View file

@ -511,7 +511,7 @@ internal-framework-uninstall::
if [ "$(HEADER_FILES)" != "" ]; then \
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
rm -rf $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done; \
fi; \

View file

@ -275,12 +275,12 @@ $(GSWBUNDLE_DIR_NAME)/WebServerResources:
internal-bundle-install:: $(GSWBUNDLE_INSTALL_DIR)
ifneq ($(HEADER_FILES_INSTALL_DIR),)
$(MKDIRS) $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR);
$(MKDIRS) $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR);
ifneq ($(HEADER_FILES),)
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done;
endif
@ -295,7 +295,7 @@ internal-bundle-uninstall::
ifneq ($(HEADER_FILES),)
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
rm -rf $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done;
endif

View file

@ -269,11 +269,11 @@ endif
internal-install-headers \
internal-subproject-uninstall
internal-subproject-install:: $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR) \
internal-subproject-install:: $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR) \
$(ADDITIONAL_INSTALL_DIRS) \
internal-install-headers
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR):
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR):
$(MKDIRS) $@
$(ADDITIONAL_INSTALL_DIRS):
@ -285,7 +285,7 @@ ifneq ($(HEADER_FILES),)
if [ $$file != __done ]; then \
$(INSTALL_DATA) \
$(HEADER_FILES_DIR)/$$file \
$(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
$(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done
endif
@ -293,7 +293,7 @@ endif
internal-subproject-uninstall::
for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
rm -f $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
rm -f $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
fi; \
done