From 85a67355c0340596630a47f85507d61c68dcbd0e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 15 Dec 2015 17:18:50 +0100
Subject: buildsystem: deal with spaces in path to source

Git-Dch: Ignore
---
 buildlib/configure.mak     | 6 +++---
 buildlib/library.mak       | 2 +-
 buildlib/po4a_manpage.mak  | 2 +-
 buildlib/program.mak       | 2 +-
 buildlib/python.mak        | 2 +-
 buildlib/staticlibrary.mak | 2 +-
 doc/en/makefile            | 2 +-
 doc/makefile               | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 6789a9988..e1a511544 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -55,8 +55,8 @@ aclocal.m4: $(wildcard buildlib/*.m4)
 	aclocal -I buildlib
 
 $(BUILDDIR)/configure-stamp: configure buildlib/config.guess buildlib/config.sub
-	/usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
-	(HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
-	touch $(BUILDDIR)/configure-stamp
+	/usr/bin/test -e '$(BUILDDIR)' || mkdir '$(BUILDDIR)'
+	(HERE="`pwd`"; cd '$(BUILDDIR)' && "$$HERE/configure")
+	touch '$(BUILDDIR)/configure-stamp'
 
 $(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/configure-stamp
diff --git a/buildlib/library.mak b/buildlib/library.mak
index 3b66b4545..7b12384c4 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -67,7 +67,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)'
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 82cfba394..df12e115c 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -51,7 +51,7 @@ clean/$(LOCAL):
 	rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent
 veryclean/$(LOCAL):
 	# we are nuking the directory we are working in as it is auto-generated
-	rm -rf $(shell readlink -f .)
+	rm -rf '$(abspath .)'
 
 HAVE_PO4A=yes
 endif
diff --git a/buildlib/program.mak b/buildlib/program.mak
index d833562d6..1b4a5719a 100644
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -50,7 +50,7 @@ $($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ $(abspath $<)
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ '$(abspath $<)'
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/python.mak b/buildlib/python.mak
index 18918bb33..25349daa0 100644
--- a/buildlib/python.mak
+++ b/buildlib/python.mak
@@ -58,7 +58,7 @@ endif  # ifdef PYTHONLIB
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)'
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index 1b3a4be20..e81770e8a 100644
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -50,7 +50,7 @@ endif
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ $(abspath $<)
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ '$(abspath $<)'
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/doc/en/makefile b/doc/en/makefile
index 1be137c73..8659de6f6 100644
--- a/doc/en/makefile
+++ b/doc/en/makefile
@@ -16,7 +16,7 @@ LOCAL := manpage-$(firstword $(SOURCE))
 $(LOCAL)-LIST := $(SOURCE)
 
 apt-vendor.ent: ../../vendor/current/apt-vendor.ent
-	ln -sf $(shell readlink -f $^) $@
+	ln -sf '$(abspath $^)' $@
 
 # Install generation hooks
 manpages: $($(LOCAL)-LIST)
diff --git a/doc/makefile b/doc/makefile
index c7391f11c..785c0b125 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -13,10 +13,10 @@ include $(DOCBOOK_H)
 doc: manpages docbook
 
 examples/sources.list: ../vendor/current/sources.list
-	ln -sf $(shell readlink -f $^) $@
+	ln -sf '$(abspath $^)' $@
 
 apt-vendor.ent: ../vendor/current/apt-vendor.ent
-	ln -sf $(shell readlink -f $^) $@
+	ln -sf '$(abspath $^)' $@
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
-- 
cgit v1.2.3