kes Reapply my bat.conf install script in qt-console. I think I

[bacula/bacula] / bacula / src / win32 / Makefile

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 9e8f133c453d41626627f97343012124270b3b24..56e8d3198ddded63f4608b374a44bf7c439f6f76 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -8,6 +8,7 @@ DIRS=   dll \
        console \
        wx-console \
        tools \
+       scripts \
        installer
 
 .PHONY: $(DIRS) clean all
@@ -18,10 +19,12 @@ clean: $(DIRS)
        $(ECHO_CMD)-rm -rf release
 
 $(DIRS):
-       @if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+       @if test -f Makefile.inc; then \
+          if $(MAKE) -C $@ $(MAKECMDGOALS); then \
                echo -e "\n===== Make of $@ succeeded =====\n\n" ; \
-       else \
+          else  \
                echo -e "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+          fi ; \
        fi
 
 Makefile.inc: Makefile.inc.in
@@ -30,9 +33,11 @@ Makefile.inc: Makefile.inc.in
        if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \
                BINDIR=$${TOPDIR}/cross-tools/mingw32/bin; \
                INCDIR=$${TOPDIR}/cross-tools/mingw32/mingw32/include; \
+               DLLDIR=$${TOPDIR}/cross-tools/mingw32/mingw32/bin; \
        elif test -e /mingw/bin/mingw32-gcc; then \
                BINDIR=/mingw/bin; \
                INCDIR=/mingw/include; \
+               DLLDIR=/mingw/bin; \
        else \
                echo -e "\nThe GCC cross compiler isn't installed."; \
                echo -e "You must run build-win32-cross-tools and build-dependencies first.\n"; \
@@ -40,4 +45,5 @@ Makefile.inc: Makefile.inc.in
        fi ; \
        sed -e "s^@TOPDIR@^$${TOPDIR}^" \
                -e "s^@BINDIR@^$${BINDIR}^" \
-               -e "s^@INCDIR@^$${INCDIR}^" < Makefile.inc.in > $@
+               -e "s^@INCDIR@^$${INCDIR}^" \
+               -e "s^@DLLDIR@^$${DLLDIR}^" < Makefile.inc.in > $@