Fix bug reported by Dan where make fails in clean of src/win32

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8343 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 0fe99cb4b46d272a6fc6b20afb6acdc689f388ef..476fdf5004148af766ccbc43f44490f562fadb8b 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -191,8 +191,11 @@ Makefiles:
         chmod 755 make_catalog_backup delete_catalog_backup)
 
 clean:
-       @for I in ${all_subdirs} src/win32; \
+       @for I in ${all_subdirs} ; \
          do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done
+       @if test `make --version | head -n1 | cut -c1-3` = "GNU" ; then \
+          (cd src/win32; ${MAKE} clean) \
+       fi
        @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
        @$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 4bfcc8bd7ee0a4b2092cd4a232049466fffe2619..23fe5d0d0d4dc372967988fa418f2cf87d9bb778 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,9 +10,11 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+09Jan09
+kes  Fix bug reported by Dan where make fails in clean of src/win32. 
 07Jan09
-kes Fix bug #1212, SD is unable to recycle purged volumes. fstat()
-    was broken.
+kes  Fix bug #1212, SD is unable to recycle purged volumes. fstat()
+     was broken.
 06Jan09
 ebl  Despool attributes directly from the director if attribute
      spool file is present