new devel_bacula + fixes to conio/console

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

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 5e64f0a485cde29d794eb027fd8a16aacf830500..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$
 #
@@ -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)