buildsystem: deal with spaces in path to source

Git-Dch: Ignore

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 6789a9988c052efccab8b4e8350c28e8537922fc..e1a511544629225933f350ca05fd4c70a9d9ffa3 100644 (file)
--- 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
        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
 
 $(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/configure-stamp

diff --git a/buildlib/library.mak b/buildlib/library.mak
index 3b66b45459a7a1be8a1ba457699549db108d5274..7b12384c4c34cd6c2736db4a06b8b5cf1bb83db0 100644 (file)
--- 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 $@
 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
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 82cfba3948ee63f1e7908481b0eca3ad02ac9af2..df12e115c41586d1713c05158c2cd33961699ac0 100644 (file)
--- 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 -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
 
 HAVE_PO4A=yes
 endif

diff --git a/buildlib/program.mak b/buildlib/program.mak
index d833562d688d06e058ebfdbda5cabfde129bac03..1b4a5719a9f2f92296b7052dbc0b30181ebdb7cc 100644 (file)
--- 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 $@
 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
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/python.mak b/buildlib/python.mak
index 18918bb33862924d57fd69854d487d2af7e3269b..25349daa0e25dd470bc4d774c3897e677376e533 100644 (file)
--- a/buildlib/python.mak
+++ b/buildlib/python.mak
@@ -58,7 +58,7 @@ endif  # ifdef PYTHONLIB
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc
        echo Compiling $< to $@
 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
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index 1b3a4be20157fb71e2a993e630542d8ee9099108..e81770e8a2b07adacb4107b33f846aa8127d0288 100644 (file)
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -50,7 +50,7 @@ endif
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
        echo Compiling $< to $@
 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
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/doc/en/makefile b/doc/en/makefile
index 1be137c73c913fbc84a2d56f52f3084a583fcd9d..8659de6f6652ff0b9927ebefbdcb8eee20a509bf 100644 (file)
--- 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
 $(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)
 
 # Install generation hooks
 manpages: $($(LOCAL)-LIST)

diff --git a/doc/makefile b/doc/makefile
index c7391f11c481655262217084ee48669b5353cd22..785c0b1252e27e37d9fa9a7c24d6f25f6f6dd3bf 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -13,10 +13,10 @@ include $(DOCBOOK_H)
 doc: manpages docbook
 
 examples/sources.list: ../vendor/current/sources.list
 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
 
 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
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf