Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/win/makefile b/win/makefile
index b850872..05269e8 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -52,9 +52,12 @@ dist: yaz.win32.nsi yaz.nsi distclean
        $(NSIS) yaz.win32.nsi
 
 dist64: yaz.win64.nsi yaz.nsi distclean
-       nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64
+       nmake make64
        $(NSIS) yaz.win64.nsi 
 
+make64:
+       nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64
+
 distclean:
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean

diff --git a/win/yaz.nsi b/win/yaz.nsi
index be73f62..9e45f74 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -37,7 +37,6 @@ ComponentText "This will install the YAZ Toolkit on your computer:"
 InstType "Full (w/ Source)"
 InstType "Lite (w/o Source)"
 
-InstallDir "$PROGRAMFILES\YAZ"
 InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
 
 

diff --git a/win/yaz.win32.nsi b/win/yaz.win32.nsi
index dfa475c..15c3843 100644 (file)
--- a/win/yaz.win32.nsi
+++ b/win/yaz.win32.nsi
@@ -2,5 +2,7 @@
 !define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
 !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
 
+InstallDir "$PROGRAMFILES\YAZ"
+
 !include yaz.nsi
 

diff --git a/win/yaz.win64.nsi b/win/yaz.win64.nsi
index c2be7d4..63208ba 100644 (file)
--- a/win/yaz.win64.nsi
+++ b/win/yaz.win64.nsi
@@ -2,5 +2,7 @@
 !define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\msvc*90.dll"
 !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
 
+InstallDir "$PROGRAMFILES64\YAZ"
+
 !include yaz.nsi