Fix: clock diff, Dan's patch, Nic's patch, segfault

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

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 91c48f7c063854893148e8eef8d5d9fd95367523..965f1a18329ae876d0ee5a7183e39acb3d4a35fc 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Bacula Makefile
+# Bacula Makefile for the File daemon
 #
 #  Version $Id$
 #
@@ -24,10 +24,10 @@ dummy:
 
 #
 SVRSRCS = filed.c authenticate.c backup.c estimate.c \
-         filed_conf.c job.c \
+         filed_conf.c heartbeat.c job.c \
          restore.c status.c verify.c verify_vol.c
 SVROBJS = filed.o authenticate.o backup.o estimate.o \
-         filed_conf.o job.o \
+         filed_conf.o heartbeat.o job.o \
          restore.o status.o verify.o verify_vol.o
 
 # these are the objects that are changed by the .configure process
@@ -54,20 +54,20 @@ all: Makefile @WIN32@ bacula-fd @STATIC_FD@
        @echo " "
 
 win32/winlib.a:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 win32/winmain.o:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 win32/winres.res:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 # win32 libraries if needed
 win32: $(WIN32OBJS)
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
@@ -112,6 +112,11 @@ install: all
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+       @if test -f static-bacula-fd; then \
+          $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
+       fi
+
+
 
 uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)