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

Excellent bug fixes from Hubert Chathi (debian), with some modifications of mine

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25725 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-12-12 00:27:17 +00:00
parent 46d15b8248
commit 06b7f4f102
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2007-12-12 Hubert Chathi <uhoreg@debian.org>
* relative_path.sh: Fixed check for start of string so that we
output '../xxx' instead of the clumsy './../xxx'.
2007-12-12 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.in (install): Fixed installation when a separate
source dir is used. (Patch by Hubert Chathi <uhoreg@debian.org>
with modifications).
2007-11-08 Adam Fedor <fedor@gnu.org>
* Mark for Version 2.0.2 (on stable branch)

7
GNUmakefile.in
View file

@ -77,7 +77,7 @@ VERTAG = $(subst .,_,$(GNUSTEP_MAKE_VERSION))
SVNPREFIX=svn+ssh://svn.gna.org/svn/gnustep/tools/make
MAKE_FILES = aggregate.make application.make bundle.make service.make \
common.make empty.make filesystem.make library-combo.make java.make jni.make library.make \
common.make empty.make library-combo.make java.make jni.make library.make \
messages.make rules.make target.make names.make resource-set.make \
tool.make ctool.make test-library.make \
objc.make test-application.make test-tool.make subproject.make \
@ -153,7 +153,7 @@ install: generated-files
$(INSTALL_DATA) $(srcdir)/GNUstep-reset.sh $(makedir); \
$(INSTALL_PROGRAM) -m 755 fixpath.sh $(makedir); \
$(INSTALL_PROGRAM) -m 755 openapp $(tooldir); \
$(INSTALL_PROGRAM) -m 755 debugapp $(tooldir); \
$(INSTALL_PROGRAM) -m 755 $(srcdir)/debugapp $(tooldir); \
$(INSTALL_PROGRAM) -m 755 opentool $(tooldir); \
$(INSTALL_PROGRAM) -m 755 gnustep-config $(tooldir))
$(EC)(echo "Installing makefiles"; \
@ -174,9 +174,10 @@ install: generated-files
$(INSTALL_DATA) $(srcdir)/Instance/Documentation/$$f \
$(makedir)/Instance/Documentation; \
done; \
$(INSTALL_DATA) app-wrapper.template $(makedir); \
$(INSTALL_DATA) $(srcdir)/app-wrapper.template $(makedir); \
$(INSTALL_DATA) executable.template $(makedir); \
$(INSTALL_DATA) config-noarch.make $(makedir); \
$(INSTALL_DATA) filesystem.make $(makedir); \
$(INSTALL_DATA) config.make $(makedir)/$(GNUSTEP_TARGET_LDIR))
$(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
echo "Stripping makefiles and shell scripts..."; \

2
relative_path.sh
View file

@ -151,7 +151,7 @@ tmp_IFS="$IFS"
IFS=/
for component in $a; do
if [ -n "$component" -a "$component" != "." ]; then
if [ -z "$result" ]; then
if [ "$result" = "." ]; then
result=".."
else
result="$result/.."