From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 26 Mar 2014 13:29:48 +0000 (+0100)
Subject: nmake: ICU_VER helper var
X-Git-Tag: v5.0.22~6
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=6b3366d135740d9ab37bdcd3f00b115fedf30a9d;p=yaz-moved-to-github.git

nmake: ICU_VER helper var
---

diff --git a/win/makefile b/win/makefile
index 8aeab91..fd1b194 100644
--- a/win/makefile
+++ b/win/makefile
@@ -192,17 +192,20 @@ iconv:
 !if $(HAVE_ICU)
 ICU_DEF= \
   /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_VER=42
 ICU_LIBS= \
   $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
-icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+icu: $(BINDIR)\icudt$(ICU_VER).dll \
+	$(BINDIR)\icuin$(ICU_VER).dll \
+	$(BINDIR)\icuuc$(ICU_VER).dll
 yazicu: dirs generate $(YAZ_ICU)
 
-$(BINDIR)\icudt42.dll:
-  copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
-$(BINDIR)\icuin42.dll:
-  copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
-$(BINDIR)\icuuc42.dll:
-  copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
+$(BINDIR)\icudt$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icudt$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuin$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuin$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuuc$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuuc$(ICU_VER).dll" $(BINDIR)
 !else
 ICU_DEF= /D YAZ_HAVE_ICU=0
 ICU_LIBS=