Remove debug DLLs part of dist. Add .manifest files

diff --git a/win/makefile b/win/makefile
index 7756e0e..cae6a84 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.

-# $Id: makefile,v 1.110 2006-06-07 09:25:47 adam Exp $
+# $Id: makefile,v 1.111 2006-06-07 14:25:43 adam Exp $

 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss

@@ -48,7 +48,6 @@ HHC="c:\program files\html help workshop\hhc.exe"
 dist: 
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
 dist: 
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean

-       nmake DEBUG=1

        nmake DEBUG=0
        $(NSIS) yaz.nsi
 
        nmake DEBUG=0
        $(NSIS) yaz.nsi
 

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 9f55d8f..fdd07af 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,4 +1,4 @@
-; $Id: yaz.nsi,v 1.86 2006-06-07 11:18:04 adam Exp $
+; $Id: yaz.nsi,v 1.87 2006-06-07 14:25:43 adam Exp $

 
 !define VERSION "2.1.21"
 
 
 !define VERSION "2.1.21"
 

@@ -96,6 +96,7 @@ Noservice:
        File ..\bin\libxml2.dll
        File ..\bin\libxslt.dll
        File ..\bin\yaz.dll
        File ..\bin\libxml2.dll
        File ..\bin\libxslt.dll
        File ..\bin\yaz.dll

+       File ..\bin\*.manifest

        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \

@@ -115,9 +116,6 @@ Section "YAZ Development" YAZ_Development
        File ..\include\yaz\*.h
        SetOutPath $INSTDIR\lib
        File ..\lib\yaz.lib
        File ..\include\yaz\*.h
        SetOutPath $INSTDIR\lib
        File ..\lib\yaz.lib

-       File ..\lib\yazd.lib
-       SetOutPath $INSTDIR\bin
-       File ..\bin\yazd.dll

 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation