[sword-cvs] sword/lib Makefile.am,1.12,1.13
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 11 Jul 2003 15:28:56 -0700
Update of /usr/local/cvsroot/sword/lib
In directory www:/tmp/cvs-serv9305/lib
Modified Files:
Makefile.am
Log Message:
dglassey: hopefully handle different versions of icu right
change the data directory for our icu files to
$(libdir)/sword/$(swordver)_icu_$(icuver)/
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/lib/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am 11 Jul 2003 21:45:22 -0000 1.12
+++ Makefile.am 11 Jul 2003 22:28:54 -0000 1.13
@@ -17,11 +17,8 @@
libsword_la_SOURCES =
if ICU
-#ICU 2.1
-#ICULIBADD = -licui18n -licuuc -lustdio
-#ICU 2.6
-ICULIBADD = -licui18n -licuuc -licuio
-ICUDEF = -DSWICU_DATA=\"${pkglibdir}/icu${ICU_VER}\"
+ICULIBADD = $(ICU_LIBS) $(ICU_IOLIBS)
+ICUDEF = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\"
else
ICULIBADD =
ICUDEF =