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 500f6a3569aaf8fc9b626cb6e922fdd666c9232d..d8b371927b00a4134230ee66ea4d2d39166bac2f 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -73,13 +73,18 @@ FDLIBS=@FDLIBS@
 .c.o:
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile bacula-sd bls bextract bscan btape
+
+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) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
 
+static-bacula-sd: $(SVROBJS) ../lib/libbac.a
+       $(CXX) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+       strip $@
+
 btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
        $(CXX) $(TTOOL_LDFLSGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
 
@@ -104,7 +109,7 @@ install: all
        $(INSTALL_PROGRAM) bacula-sd $(DESTDIR)$(sbindir)/bacula-sd
        $(INSTALL_PROGRAM) bls $(DESTDIR)$(sbindir)/bls
        $(INSTALL_PROGRAM) bextract $(DESTDIR)$(sbindir)/bextract
-       $(INSTALL_PROGRAM) bcopy $(DESTDIR)$(sbindir)/bcopy
+#      $(INSTALL_PROGRAM) bcopy $(DESTDIR)$(sbindir)/bcopy
        $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
        $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
        @srcconf=bacula-sd.conf; \
@@ -114,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)
@@ -124,19 +129,19 @@ 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
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile)
+       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
 
 # Semi-automatic generation of dependencies: