Set SHTOOL directly. Add 'make pathtest'.

[openldap] / libraries / liblunicode / Makefile.in

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index c9b8e11e4f9e3c5b83452d3f3f055d6043d69b74..a243aac30636b216453c462c3727e1492c06cfda 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## Makefile.in for LDAP -lldap
@@ -13,17 +13,17 @@ XXSRCS      = ucdata.c ucgendat.c ure.c urestubs.c
 SRCS   = ucstr.c
 OBJS   = ucdata.o ure.o urestubs.o ucstr.o
 
-XLIB = -llunicode
+XLIB = $(LIBRARY)
 PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-ucgendat: $(LIBRARY) ucgendat.o
+ucgendat: $(XLIBS) ucgendat.o
        $(LTLINK) -o $@ ucgendat.o $(LIBS)
-       ./ucgendat $(srcdir)/UnicodeData.txt
+       ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
 
-DATFILES = case.dat cmbcl.dat ctype.dat decomp.dat num.dat
+DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat
 
 install-local: $(PROGRAMS) FORCE
        -$(MKDIR) $(DESTDIR)$(datadir)/ucdata