Don't strip libmysql.dll

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

diff --git a/bacula/src/win32/installer/Makefile b/bacula/src/win32/installer/Makefile
index deee361d7c4a5b0b544988f9ffdfaf183baa56a9..30f6a650eab8566c0f071d61aa0ce09b9d3c00b5 100644 (file)
--- a/bacula/src/win32/installer/Makefile
+++ b/bacula/src/win32/installer/Makefile
@@ -11,9 +11,7 @@ VERSION := $(shell sed -ne 's/.*[ \t]VERSION[ \t]\+"\(.*\)"/\1/p' < ../../versio
 
 DEFINES := \
        -DVERSION=$(VERSION) \
-       -DBINDIR=$(BINDIR) \
        -DDOCDIR=$(DOCDIR) \
-       -DDEPKGS=$(DEPKGS) \
        -DMINGW_BIN=$(MINGW_BIN) 
 
 INSTALL_EXE := winbacula-$(VERSION).exe
@@ -34,7 +32,6 @@ BACULA_BINARIES := \
 
 DEPKGS_BINARIES := \
        libeay32.dll \
-       libmysql.dll \
        pthreadGCE.dll \
        ssleay32.dll \
        zlib1.dll \
@@ -47,6 +44,9 @@ DEPKGS_BINARIES := \
        wxbase26_gcc_bacula.dll \
        wxmsw26_core_gcc_bacula.dll
 
+NONGCC_BINARIES := \
+       libmysql.dll
+
 SCRIPTS := \
        ../scripts/mtx-changer.cmd.in \
        ../cats/create_mysql_database.cmd \
@@ -74,7 +74,7 @@ installer:    $(INSTALL_EXE)
 
 clean:
        @echo "Cleaning `pwd`"
-       $(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES)
+       $(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES)
        $(CMD_ECHO)-rm -f $(BACULA_BINARIES) $(addsuffix .dbg,$(basename $(BACULA_BINARIES)))
        $(CMD_ECHO)-rm -f $(DEPKGS_BINARIES) $(addsuffix .dbg,$(basename $(DEPKGS_BINARIES)))
 
@@ -88,11 +88,18 @@ $$(notdir $(1)): $(1)
        $$(call makedbg,$$@)
 endef
 
+define Copy_Binary
+$$(notdir $(1)): $(1)
+       $(ECHO_CMD)cp -f $$^ $$@
+endef
+
 $(foreach file,$(addprefix $(DEPKGS)/bin/, $(DEPKGS_BINARIES)),$(eval $(call Strip_Binary,$(file))))
 
+$(foreach file,$(addprefix $(DEPKGS)/bin/, $(NONGCC_BINARIES)),$(eval $(call Copy_Binary,$(file))))
+
 $(foreach file,$(addprefix $(BINDIR)/, $(BACULA_BINARIES)),$(eval $(call Strip_Binary,$(file))))
 
-$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES)
+$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES) $(NONGCC_BINARIES)
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi