mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
ttmept fix for bug #34838 plus hard coded make invocations
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@37609 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
8149f13934
commit
e955aa422a
5 changed files with 55 additions and 36 deletions
16
ChangeLog
16
ChangeLog
|
|
@ -1,9 +1,17 @@
|
|||
2014-01-16 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* GNUmakefile.in:
|
||||
Fix a couple more hardcoded 'make' calls.
|
||||
* Instance/resource-set.make:
|
||||
* Instance/Shared/bundle.make:
|
||||
Try to get xxx_RESOURCE_DIR woreking consistently for all resources.
|
||||
|
||||
2014-01-12 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||
|
||||
* config.make.in, GNUmakefile.in
|
||||
Do not hardcode "make". It already gets detected via configure,
|
||||
so use the found name, especially on *BSD systems where its called
|
||||
gmake
|
||||
* config.make.in, GNUmakefile.in:
|
||||
Do not hardcode "make". It already gets detected via configure,
|
||||
so use the found name, especially on *BSD systems where its called
|
||||
gmake
|
||||
|
||||
2014-01-10 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
|
|
|
|||
|
|
@ -322,11 +322,11 @@ uninstall:
|
|||
-rmdir "$(tooldir)"
|
||||
|
||||
clean:
|
||||
(cd Documentation; make distclean)
|
||||
(cd Documentation; $(MAKE) distclean)
|
||||
rm -f *~ Master/*~ Instance/*~ Instance/Shared/*~
|
||||
|
||||
distclean: clean
|
||||
(cd Documentation; make distclean)
|
||||
(cd Documentation; $(MAKE) distclean)
|
||||
rm -f GNUmakefile config-noarch.make config.make config.h
|
||||
rm -f config.cache config.log config.status
|
||||
rm -f openapp opentool executable.template
|
||||
|
|
|
|||
|
|
@ -79,6 +79,10 @@
|
|||
# $(GNUSTEP_INSTANCE)_RESOURCE_DIRS : a list of additional resource dirs
|
||||
# to create.
|
||||
#
|
||||
# $(GNUSTEP_INSTANCE)_RESOURCE_FILES_DIR : the directory in which the
|
||||
# resource files and localized resource files are to be found
|
||||
# (defaults to ./ if omitted).
|
||||
#
|
||||
# $(GNUSTEP_INSTANCE)_LANGUAGES : the list of languages of localized resource
|
||||
# files (processed in rules.make, and converted into a LANGUAGES list)
|
||||
#
|
||||
|
|
@ -146,6 +150,12 @@
|
|||
# are not included, so we let the caller always provide it}
|
||||
#
|
||||
|
||||
# Determine the dir to take the resources from
|
||||
RESOURCE_FILES_DIR = $($(GNUSTEP_INSTANCE)_RESOURCE_FILES_DIR)
|
||||
ifeq ($(RESOURCE_FILES_DIR),)
|
||||
RESOURCE_FILES_DIR = ./
|
||||
endif
|
||||
|
||||
RESOURCE_FILES = $(strip $($(GNUSTEP_INSTANCE)_RESOURCE_FILES) \
|
||||
$($(GNUSTEP_INSTANCE)_COMPONENTS))
|
||||
RESOURCE_DIRS = $(strip $($(GNUSTEP_INSTANCE)_RESOURCE_DIRS))
|
||||
|
|
@ -223,39 +233,39 @@ shared-instance-bundle-all: $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH) \
|
|||
shared-instance-bundle-all-gsweb
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
$(ECHO_COPYING_RESOURCES)for f in $(RESOURCE_FILES); do \
|
||||
if [ -f $$f -o -d $$f ]; then \
|
||||
cp -fr $$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/; \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$f -o -d $(RESOURCE_FILES_DIR)/$$f ]; then \
|
||||
cp -fr $(RESOURCE_FILES_DIR)/$$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/; \
|
||||
else \
|
||||
echo "Warning: $$f not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$f not found - ignoring"; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
ifneq ($(LOCALIZED_RESOURCE_DIRS),)
|
||||
$(ECHO_CREATING_LOC_RESOURCE_DIRS)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
if [ -d $(RESOURCE_FILES_DIR)/$$l.lproj ]; then \
|
||||
$(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
|
||||
for f in $(LOCALIZED_RESOURCE_DIRS); do \
|
||||
$(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj/$$f; \
|
||||
done; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
ifneq ($(LOCALIZED_RESOURCE_FILES),)
|
||||
$(ECHO_COPYING_LOC_RESOURCES)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
if [ -d $(RESOURCE_FILES_DIR)/$$l.lproj ]; then \
|
||||
$(MKDIRS) $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f -o -d $$l.lproj/$$f ]; then \
|
||||
cp -fr $$l.lproj/$$f \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$l.lproj/$$f -o -d $(RESOURCE_FILES_DIR)/$$l.lproj/$$f ]; then \
|
||||
cp -fr $(RESOURCE_FILES_DIR)/$$l.lproj/$$f \
|
||||
$(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$l.lproj/; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj/$$f not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj/$$f not found - ignoring"; \
|
||||
fi; \
|
||||
done; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -39,10 +39,11 @@ endif
|
|||
# The list of resource directories to create are in xxx_RESOURCE_DIRS
|
||||
# The directory in which to install the resources is in the
|
||||
# xxx_INSTALL_DIR
|
||||
# The directory in which the resources are is in the
|
||||
# The directory in which the resources are found is
|
||||
# xxx_RESOURCE_FILES_DIR (defaults to ./ if omitted)
|
||||
# The list of LANGUAGES is in the xxx_LANGUAGES variable.
|
||||
# The list of localized files/dirs to be read from yyy.lproj and copied
|
||||
# The list of localized files/dirs to be read
|
||||
# from $(xxx_RESOURCE_FILES_DIR)/yyy.lproj and copied
|
||||
# into $(RESOURCE_FILES_INSTALL_DIR)/yyy.lproj for each language yyy
|
||||
# is in the xxx_LOCALIZED_RESOURCE_FILES variable.
|
||||
# The list of localized dirs to be created empty inside each
|
||||
|
|
@ -118,7 +119,7 @@ internal-resource_set-install_: \
|
|||
$(foreach LANGUAGE,$(LANGUAGES),$(addprefix $(RESOURCE_FILES_INSTALL_DIR)/$(LANGUAGE), $(LOCALIZED_RESOURCE_DIRS)))
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
$(ECHO_NOTHING)for f in $(RESOURCE_FILES); do \
|
||||
if [ -f $$f -o -d $$f ]; then \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$f -o -d $(RESOURCE_FILES_DIR)/$$f ]; then \
|
||||
cp -fr $(RESOURCE_FILES_DIR)/$$f \
|
||||
$(RESOURCE_FILES_INSTALL_DIR)/$$f; \
|
||||
else \
|
||||
|
|
@ -127,7 +128,7 @@ ifneq ($(RESOURCE_FILES),)
|
|||
done$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)for f in $(RESOURCE_FILES); do \
|
||||
if [ -f $$f -o -d $$f ]; then \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$f -o -d $(RESOURCE_FILES_DIR)/$$f ]; then \
|
||||
$(CHOWN) -R $(CHOWN_TO) $(RESOURCE_FILES_INSTALL_DIR)/$$f; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
|
|
@ -135,26 +136,26 @@ endif
|
|||
endif
|
||||
ifneq ($(LOCALIZED_RESOURCE_FILES),)
|
||||
$(ECHO_NOTHING)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
if [ -d $(RESOURCE_FILES_DIR)/$$l.lproj ]; then \
|
||||
$(MKINSTALLDIRS) $(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f -o -d $$l.lproj/$$f ]; then \
|
||||
cp -fr $$l.lproj/$$f \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$l.lproj/$$f -o -d $(RESOURCE_FILES_DIR)$$l.lproj/$$f ]; then \
|
||||
cp -fr $(RESOURCE_FILES_DIR)/$$l.lproj/$$f \
|
||||
$(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj/$$f not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj/$$f not found - ignoring"; \
|
||||
fi; \
|
||||
done; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
if [ -d $(RESOURCE_FILES_DIR)/$$l.lproj ]; then \
|
||||
$(CHOWN) -R $(CHOWN_TO) $(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f -o -d $$l.lproj/$$f ]; then \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$l.lproj/$$f -o -d $(RESOURCE_FILES_DIR)/$$l.lproj/$$f ]; then \
|
||||
$(CHOWN) -R $(CHOWN_TO) $(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj/$$f; \
|
||||
fi; \
|
||||
done; \
|
||||
|
|
@ -201,19 +202,19 @@ $(addsuffix .lproj,$(addprefix $(RESOURCE_FILES_INSTALL_DIR)/,$(LANGUAGES))):
|
|||
internal-resource-set-install-languages: \
|
||||
$(addsuffix .lproj,$(addprefix $(RESOURCE_FILES_INSTALL_DIR)/,$(LANGUAGES)))
|
||||
$(ECHO_NOTHING)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
if [ -d $(RESOURCE_FILES_DIR)/$$l.lproj ]; then \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f ]; then \
|
||||
if [ $$l.lproj -nt $(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj/$$f ]; then \
|
||||
$(INSTALL_DATA) $$l.lproj/$$f \
|
||||
if [ -f $(RESOURCE_FILES_DIR)/$$l.lproj/$$f ]; then \
|
||||
if [ $(RESOURCE_FILES_DIR)/$$l.lproj -nt $(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj/$$f ]; then \
|
||||
$(INSTALL_DATA) $(RESOURCE_FILES_DIR)/$$l.lproj/$$f \
|
||||
$(RESOURCE_FILES_INSTALL_DIR)/$$l.lproj; \
|
||||
fi; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj/$$f not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj/$$f not found - ignoring"; \
|
||||
fi; \
|
||||
done; \
|
||||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
echo "Warning: $(RESOURCE_FILES_DIR)/$$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done$(END_ECHO)
|
||||
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ then
|
|||
if test "$MSWIND" = "yes"
|
||||
then
|
||||
echo "Please note that on windows you must use unix-style paths within"
|
||||
echo "the make package even though gnustep programs built in the mingw32"
|
||||
echo "the make package even though gnustep programs built in the mingw"
|
||||
echo "environment use native paths throughout."
|
||||
fi
|
||||
exit 1
|
||||
|
|
@ -627,7 +627,7 @@ then
|
|||
if test "$MSWIND" = "yes"
|
||||
then
|
||||
echo "Please note that on windows you must use unix-style paths within"
|
||||
echo "the make package even though gnustep programs built in the mingw32"
|
||||
echo "the make package even though gnustep programs built in the mingw"
|
||||
echo "environment use native paths throughout."
|
||||
fi
|
||||
exit 1
|
||||
|
|
@ -681,7 +681,7 @@ then
|
|||
if test "$MSWIND" = "yes"
|
||||
then
|
||||
echo "Please note that on windows you must use unix-style paths within"
|
||||
echo "the make package even though gnustep programs built in the mingw32"
|
||||
echo "the make package even though gnustep programs built in the mingw"
|
||||
echo "environment use native paths throughout."
|
||||
fi
|
||||
exit 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue