From: Radosław Korzeniewski <radoslaw@korzeniewski.net>
Date: Fri, 19 Feb 2021 14:24:50 +0000 (+0100)
Subject: build: Update and fix build procedure.
X-Git-Tag: Release-11.3.2~691
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc49a6f6460a59c46c206448f8865f8dfca286c1;p=thirdparty%2Fbacula.git

build: Update and fix build procedure.
---

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 45eb9fc54..962a3d277 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -55,10 +55,11 @@ all: Makefile
 
 depend:
 	@for I in ${all_subdirs}; \
-	   do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+	   do echo "==> Entering directory $$I" ; \
+	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ ; done
 	@for I in ${pluginsdirs}; \
-	   do echo "==>Entering directory ${I}"
-	      $(MAKE) DESTDIR=$(DESTDIR) -C ${I} $@ ; done
+	   do echo "==> Plugin directory $$I" ; \
+	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ ; done
 
 bacula-fd: Makefile
 	@for I in ${fd_subdirs}; \
@@ -70,7 +71,7 @@ bacula-fd: Makefile
 
 plugins:
 	@for I in ${pluginsdirs}; \
-	   do echo "==> Plugin directory" $$I; \
+	   do echo "==> Plugin directory" $$I ; \
 	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ; done
 
 #-------------------------------------------------------------------------
@@ -166,7 +167,7 @@ uninstall-autostart-sd:
 
 install-plugins:
 	@for I in ${pluginsdirs}; \
-	   do echo "==> Plugin directory $$I"; \
+	   do echo "==> Plugin directory $$I" ; \
 	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I install ; done
 
 Makefile: Makefile.in
diff --git a/bacula/manpages/Makefile.in b/bacula/manpages/Makefile.in
index dab1f1807..8d8a48465 100644
--- a/bacula/manpages/Makefile.in
+++ b/bacula/manpages/Makefile.in
@@ -11,7 +11,7 @@ MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
        btraceback.8 dbcheck.8 bwild.8 bregex.8
 
 MAN1 = bsmtp.1 bat.1
-      
+
 all:
 
 nothing:
@@ -44,7 +44,7 @@ clean:
 	@$(RMF) *~ 1 2 3 *.bak
 	@find . -name .#* -exec $(RMF) {} \;
 
-depend:      
+depend:
 
 distclean: clean
 	$(RMF) Makefile
diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 11d13bb07..91a423dc9 100644
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -352,7 +352,7 @@ acsls-changer.o: acsls-changer.c
 # libdir points to /opt/bacula/lib, but libtools decides to store libraries to
 # /opt/bacula/lib64 on some platforms. We can add the two directories in rpath
 # to workaround the problem.
-acsls-changer: Makefile $(ACSLSCHGOBJS) 
+acsls-changer: Makefile $(ACSLSCHGOBJS)
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib/.libs $(ACSLSCHGOBJS) -L../lib -lbac $(LIBS) $(GETTEXT_LIBS) -Wl,-rpath $(libdir) -o $@
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -452,7 +452,7 @@ install-swift-cloud: bacula-sd-cloud-swift-driver.la
 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-sd-cloud-swift-driver$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)
 	$(RMF) $(DESTDIR)$(plugindir)/bacula-sd-cloud-swift-driver.la
 
-install-aligned:  bacula-sd-aligned-driver.la 
+install-aligned:  bacula-sd-aligned-driver.la
 	$(MKDIR) $(DESTDIR)$(plugindir)
 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-sd-aligned-driver$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)
 	$(RMF) $(DESTDIR)$(plugindir)/bacula-sd-aligned-driver.la
@@ -509,7 +509,9 @@ depend:
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(S3_INC) -I$(srcdir) -I$(basedir) -I$(ACSLS_LIBDIR)/src/h *.c >> Makefile
-	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(S3_INC) -I$(srcdir) -I$(basedir) -std=c++11 *.cpp >> Makefile || true
+	@set -- *.cpp ; if test -f "$1" ; then \
+	   $(CXX) -S -M $(CPPFLAGS) $(XINC) $(S3_INC) -I$(srcdir) -I$(basedir) -std=c++11 *.cpp >> Makefile ; \
+	fi
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \