@matheusbsbs / matheus-bagliano / commits / 4769948afe
Fork 0

Deal with $(bindir) and friends with whitespaces.

... using HPA's shellquote macro. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Oct 10, 2005 at 13:50 UTC 4769948afe7c502d37746edc2ee2c084c9dcb325
4 files changed +36 -18
Makefile
+20 -14
@@ -163,6 +163,12 @@ LIB_OBJS = \
163 LIBS = $(LIB_FILE)
164 LIBS += -lz
165
166 +# Shell quote;
167 +# Result of this needs to be placed inside ''
168 +shq = $(subst ','\'',$(1))
169 +# This has surrounding ''
170 +shellquote = '$(call shq,$(1))'
171 +
172 #
173 # Platform specific tweaks
174 #
@@ -235,7 +241,7 @@ ifndef NO_OPENSSL
241 OPENSSL_LINK =
242 endif
243 else
238 - DEFINES += '-DNO_OPENSSL'
244 + DEFINES += -DNO_OPENSSL
245 MOZILLA_SHA1 = 1
246 OPENSSL_LIBSSL =
247 endif
@@ -294,7 +300,7 @@ endif
300 endif
301 endif
302
297 -DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
303 +DEFINES += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER))
304
305 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
306 $(patsubst %.perl,%,$(SCRIPT_PERL)) \
@@ -311,7 +317,7 @@ all:
317
318 git: git.sh Makefile
319 rm -f $@+ $@
314 - sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
320 + sed -e '1s|#!.*/sh|#!$(call shq,$(SHELL_PATH))|' \
321 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
322 -e 's/@@X@@/$(X)/g' \
323 $(GIT_LIST_TWEAK) <$@.sh >$@+
@@ -320,22 +326,22 @@ git: git.sh Makefile
326
327 $(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
328 rm -f $@
323 - sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
329 + sed -e '1s|#!.*/sh|#!$(call shq,$(SHELL_PATH))|' \
330 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
331 $@.sh >$@
332 chmod +x $@
333
334 $(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
335 rm -f $@
330 - sed -e '1s|#!.*perl|#!$(PERL_PATH)|' \
336 + sed -e '1s|#!.*perl|#!$(call shq,$(PERL_PATH))|' \
337 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
338 $@.perl >$@
339 chmod +x $@
340
341 $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
342 rm -f $@
337 - sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \
338 - -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \
343 + sed -e '1s|#!.*python|#!$(call shq,$(PYTHON_PATH))|' \
344 + -e 's|@@GIT_PYTHON_PATH@@|$(call shq,$(GIT_PYTHON_DIR))|g' \
345 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
346 $@.py >$@
347 chmod +x $@
@@ -365,7 +371,7 @@ git-rev-list$X: LIBS += $(OPENSSL_LIBSSL)
371
372 init-db.o: init-db.c
373 $(CC) -c $(ALL_CFLAGS) \
368 - -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
374 + -DDEFAULT_GIT_TEMPLATE_DIR=$(call shellquote,"$(template_dir)") $*.c
375
376 $(LIB_OBJS): $(LIB_H)
377 $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H)
@@ -397,13 +403,13 @@ check:
403 ### Installation rules
404
405 install: $(PROGRAMS) $(SCRIPTS)
400 - $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
401 - $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
402 - $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
403 - sh ./cmd-rename.sh $(DESTDIR)$(bindir)
406 + $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
407 + $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
408 + $(INSTALL) git-revert $(call shellquote,$(DESTDIR)$(bindir)/git-cherry-pick)
409 + sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))
410 $(MAKE) -C templates install
405 - $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
406 - $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
411 + $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
412 + $(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
413
414 install-doc:
415 $(MAKE) -C Documentation install
git-merge-recursive.py
+1 -1
@@ -4,7 +4,7 @@ import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
4 from heapq import heappush, heappop
5 from sets import Set
6
7 -sys.path.append('@@GIT_PYTHON_PATH@@')
7 +sys.path.append('''@@GIT_PYTHON_PATH@@''')
8 from gitMergeCommon import *
9
10 originalIndexFile = os.environ.get('GIT_INDEX_FILE',
t/Makefile
+7 -1
@@ -7,10 +7,16 @@
7 SHELL_PATH ?= $(SHELL)
8 TAR ?= $(TAR)
9
10 +# Shell quote;
11 +# Result of this needs to be placed inside ''
12 +shq = $(subst ','\'',$(1))
13 +# This has surrounding ''
14 +shellquote = '$(call shq,$(1))'
15 +
16 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
17
18 all:
13 - @$(foreach t,$T,echo "*** $t ***"; $(SHELL_PATH) $t $(GIT_TEST_OPTS) || exit; )
19 + @$(foreach t,$T,echo "*** $t ***"; $(call shellquote,$(SHELL_PATH)) $t $(GIT_TEST_OPTS) || exit; )
20 @rm -fr trash
21
22 clean:
templates/Makefile
+8 -2
@@ -6,6 +6,12 @@ prefix ?= $(HOME)
6 template_dir ?= $(prefix)/share/git-core/templates/
7 # DESTDIR=
8
9 +# Shell quote;
10 +# Result of this needs to be placed inside ''
11 +shq = $(subst ','\'',$(1))
12 +# This has surrounding ''
13 +shellquote = '$(call shq,$(1))'
14 +
15 all: boilerplates.made custom
16 find blt
17
@@ -38,6 +44,6 @@ clean:
44 rm -rf blt boilerplates.made
45
46 install: all
41 - $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
47 + $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(template_dir))
48 (cd blt && $(TAR) cf - .) | \
43 - (cd $(DESTDIR)$(template_dir) && $(TAR) xf -)
49 + (cd $(call shellquote,$(DESTDIR)$(template_dir)) && $(TAR) xf -)