Fix install of bconsole

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

diff --git a/bacula/src/win32/Makefile.in b/bacula/src/win32/Makefile.in
index f5ca769be2702e848da3e024f9e8fb0a40eb2bf9..29613fce8e9829efc7bae16ca59b98a389027f19 100644 (file)
--- a/bacula/src/win32/Makefile.in
+++ b/bacula/src/win32/Makefile.in
@@ -12,12 +12,15 @@ first_rule: all
 
 dummy:
 
-all:  bacula installer
+all:  bacula bconsole installer
 
 
 bacula:
        (cd baculafd; env MAKEFLAGS= ${NMAKE} CFG="baculafd - Win32 Release" /f baculafd.mak)
 
+bconsole:
+       (cd console; env MAKEFLAGS= ${NMAKE} CFG="console - Win32 Release" /f console.mak)
+
 #
 # Quickie debug installation
 #

diff --git a/bacula/src/win32/winbacula.nsi.in b/bacula/src/win32/winbacula.nsi.in
index e80ffcf14568d10bd34c3369ab042519bcf9868f..f576f579719ff32a66a4a0ffa167567de858bb98 100755 (executable)
--- a/bacula/src/win32/winbacula.nsi.in
+++ b/bacula/src/win32/winbacula.nsi.in
@@ -90,10 +90,10 @@ Section "Bacula File Service" SecService
   File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
   File License.txt
   IfFileExists "$INSTDIR\bin\bacula-fd.conf" newconf 
-  File bacula-fd.conf
+  File baculafd\bacula-fd.conf
   goto do_service
  newconf:
-  File /oname=bacula-fd.conf.new bacula-fd.conf
+  File /oname=bacula-fd.conf.new baculafd\bacula-fd.conf
        
   ; If /service was given jump to the service install part
  do_service: