Merge branch 'master' into next

[ipfire-2.x.git] / lfs / bacula

diff --git a/lfs/bacula b/lfs/bacula
index 54864b229595dfe1b81aaddbeb9357b23d9258ec..0e7d39ba62e93555ad4ce7797e7ec232bbbe53b4 100644 (file)
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -77,12 +77,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --enable-client-only
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --sysconfdir=/etc/bacula \
+                               --with-working-dir=/var/bacula/working \
+                               --enable-client-only
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       mv -f /sbin/bacula /etc/init.d/bacula
-       mv -f /opt/bacula /var/
-       sed -i -e 's#/opt/bacula/working#/var/bacula/working#' /etc/bacula/bacula-fd.conf
+       ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
        rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
+