summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-12-15 17:18:50 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-12-19 23:04:34 +0100
commit85a67355c0340596630a47f85507d61c68dcbd0e (patch)
tree872556e3a613a05c86116fd62dfa100a4ca52fbd /buildlib
parent39e77e45ae627165a8f89d83a8f875251920ce05 (diff)
buildsystem: deal with spaces in path to source
Git-Dch: Ignore
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/configure.mak6
-rw-r--r--buildlib/library.mak2
-rw-r--r--buildlib/po4a_manpage.mak2
-rw-r--r--buildlib/program.mak2
-rw-r--r--buildlib/python.mak2
-rw-r--r--buildlib/staticlibrary.mak2
6 files changed, 8 insertions, 8 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