Fix org#2440 Improve Makefiles to use relative paths

We use the attached patch in Debian to work around an issue in GCC.
See https://tests.reproducible-builds.org/debian/issues/unstable/gcc_captures_build_path_issue.html
Also this makes the Makefiles more self-consistent, most use a relative path as "basedir".

Thanks to Sven Hartge <sven@svenhartge.de>

diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in
index ee20420a702506a0ffc6358d8a4d0439c9c91598..60757834a38153af2ddbc061b06a2e323361ec3a 100644 (file)
--- a/bacula/src/Makefile.in
+++ b/bacula/src/Makefile.in
@@ -9,9 +9,9 @@ VPATH =         .
 .PATH:         .
 
 # one up
-basedir = @BUILD_DIR@
+basedir = ..
 # top dir
-topdir = @BUILD_DIR@
+topdir = ..
 # this dir relative to top dir
 thisdir = src
 

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 888c626645fec188f669af9b0a0c1a65e668d501..691a6f62c1aaf93e656d58ca58f7bddca2de87e4 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -13,9 +13,9 @@ VPATH =       .
 dir_group=@dir_group@
 
 # one up
-basedir = @BUILD_DIR@/src
+basedir = ..
 # top dir
-topdir = @BUILD_DIR@
+topdir = ../..
 # this dir relative to top dir
 thisdir = src/dird