From: Adam Dickmeiss Date: Wed, 19 Feb 1997 16:22:21 +0000 (+0000) Subject: Fixed NETLIBS variable in Makefile. Fixed "end element" to terminate X-Git-Tag: ZEBRA.1.0~339 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=4761eb8c7f59142020d60e68127a159e9ad4ef55 Fixed NETLIBS variable in Makefile. Fixed "end element" to terminate record in outer-most level. --- diff --git a/CHANGELOG b/CHANGELOG index 48c0ab1..ba0a6f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Added feature in regx-filters: "end element" on outer-most level will +perform an implicit "end record". + Bug fix: The show records facility (-s) only displayed information for the first record in a file (and not for every record in the file). diff --git a/Makefile b/Makefile index 1837e1b..35a47b1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994-1996, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.57 1996-12-20 11:06:37 adam Exp $ +# $Id: Makefile,v 1.58 1997-02-19 16:22:22 adam Exp $ SHELL=/bin/sh MAKE=make @@ -15,12 +15,12 @@ YAZINC=-I../../yaz/include #OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a # Some systems have seperate socket libraries -#NETLIB=-lnsl -lsocket +#ELIBS=-lnsl -lsocket SUBDIR=util bfile dfa dict isamc isam rset recctrl index all: - for i in $(SUBDIR); do cd $$i; if $(MAKE) OSILIB="$(OSILIB)" YAZLIB="$(YAZLIB)" YAZINC="$(YAZINC)" RANLIB="$(RANLIB)" NETLIB="$(NETLIB)" CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done + for i in $(SUBDIR); do cd $$i; if $(MAKE) OSILIB="$(OSILIB)" YAZLIB="$(YAZLIB)" YAZINC="$(YAZINC)" RANLIB="$(RANLIB)" ELIBS="$(ELIBS)" CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done dep depend: for i in $(SUBDIR); do cd $$i; if $(MAKE) YAZINC="$(YAZINC)" depend; then cd ..; else exit 1; fi; done diff --git a/doc/zebra.sgml b/doc/zebra.sgml index a50f22b..7b83012 100644 --- a/doc/zebra.sgml +++ b/doc/zebra.sgml @@ -1,13 +1,13 @@
Zebra Server - Administrators's Guide and Reference <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">, <tt><htmlurl url="mailto:info@index.ping.dk" name="info@index.ping.dk"></> -<date>$Revision: 1.34 $ +<date>$Revision: 1.35 $ <abstract> The Zebra information server combines a versatile fielded/free-text search engine with a Z39.50-1995 frontend to provide a powerful and flexible @@ -194,7 +194,7 @@ provide an adequate compiler. Unpack the distribution archive. In some cases, you may want to edit the top-level <tt/Makefile/, eg. to select a different C compiler, or -to specify machine-specific libraries in the <bf/NETLIB/ variable. +to specify machine-specific libraries in the <bf/ELIBS/ variable. When you are done editing the <tt>Makefile</tt> type: <tscreen><verb>