Mult Vols + fix restore hard links + file permissions

[bacula/bacula] / bacula / src / stored / Makefile.in

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index efb478a3d62be959da5a6f238508f81320917b62..d8b371927b00a4134230ee66ea4d2d39166bac2f 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -74,15 +74,15 @@ FDLIBS=@FDLIBS@
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 
-all: Makefile bacula-sd bls bextract bscan btape bcopy
+all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
        @echo "===== Make of stored is good ===="
        @echo " "
 
 bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+       $(CXX) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
 
 static-bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+       $(CXX) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
        strip $@
 
 btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
@@ -119,8 +119,8 @@ install: all
        else \
           destconf=$$srcconf; \
        fi; \
-       echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-       ${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+       echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+       ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 
 uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-sd)
@@ -129,12 +129,12 @@ uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bcopy)
        (cd $(DESTDIR)$(sbindir); $(RMF) bscan)
        (cd $(DESTDIR)$(sbindir); $(RMF) btape)
-       (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-sd.conf)
+       (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-sd.conf bacula-sd.conf.new)
 
 
 clean:
        @$(RMF) bacula-sd stored bls bextract bpool btape shmfree core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
-       @$(RMF) bscan bcopy
+       @$(RMF) bscan bcopy static-bacula-sd
 
 realclean: clean
        @$(RMF) tags bacula-sd.conf