From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 18 Nov 2008 08:36:11 +0000 (+0100)
Subject: Updates for the ISO5426 source.
X-Git-Tag: v3.0.40~45
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=3489c6eaceb7ab7f4e8298a2f898dda0c3d0a09c;p=yaz-moved-to-github.git

Updates for the ISO5426 source.
---

diff --git a/win/makefile b/win/makefile
index 3137e98..c096690 100644
--- a/win/makefile
+++ b/win/makefile
@@ -443,6 +443,7 @@ MISC_OBJS= \
    $(OBJDIR)\snprintf.obj \
    $(OBJDIR)\marc8.obj \
    $(OBJDIR)\marc8r.obj \
+   $(OBJDIR)\iso5426.obj \
    $(OBJDIR)\record_conv.obj \
    $(OBJDIR)\retrieval.obj \
    $(OBJDIR)\libxml2_error.obj \
@@ -493,6 +494,7 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_encode_marc8.obj \
    $(OBJDIR)\iconv_decode_marc8.obj \
    $(OBJDIR)\iconv_encode_wchar.obj \
+   $(OBJDIR)\iconv_decode_iso5426.obj \
    $(OBJDIR)\mutex.obj \
    $(OBJDIR)\sc.obj
 
@@ -754,6 +756,10 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
 
+$(SRCDIR)\iso5426.c: $(SRCDIR)\codetables-iso5426.xml $(SRCDIR)\charconv.tcl
+	@cd $(SRCDIR)
+	$(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
+
 $(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
diff --git a/win/yaz.nsi b/win/yaz.nsi
index e67b81a..444b146 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -155,7 +155,7 @@ Section "YAZ Source" YAZ_Source
 	File ..\src\*.tcl
 	File ..\src\*.csv
 	File ..\src\*.asn
-	File ..\src\codetables.xml
+	File ..\src\codetables*.xml
 	SetOutPath $INSTDIR\test
 	File ..\test\marc*.*
 	File ..\test\*.sh