[PATCH] Git.pm build: Fix quoting and missing GIT-CFLAGS dependency
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
This one should do a better job; if we quote, let's do it proper. :-)
Makefile | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 9a59466..fb9ffad 100644
--- a/Makefile
+++ b/Makefile
@@ -608,11 +608,15 @@ XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare
rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
-perl/Makefile: perl/Git.pm perl/Makefile.PL
+PERL_DEFINE = $(ALL_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
+PERL_DEFINE_SQ = $(subst ','\'',$(PERL_DEFINE))
+PERL_LIBS = $(EXTLIBS)
+PERL_LIBS_SQ = $(subst ','\'',$(PERL_LIBS))
+perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
(cd perl && $(PERL_PATH) Makefile.PL \
- PREFIX="$(prefix)" \
- DEFINE="$(ALL_CFLAGS) -DGIT_VERSION=\\\"$(GIT_VERSION)\\\"" \
- LIBS="$(EXTLIBS)")
+ PREFIX='$(prefix_SQ)' \
+ DEFINE='$(PERL_DEFINE_SQ)' \
+ LIBS='$(PERL_LIBS)')
doc:
$(MAKE) -C Documentation all
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.