X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=Makefile.web;h=98e5bbb38bfd9f490295932a755cc4d7314f1a13;hb=c92eb2c721af54306a5596067456f69b0a197c4e;hp=dee1d1517072b55314538b82aaed04516dfb85a3;hpb=86560b2bfc5db8d1166bd42973c3bb5baf28e27e;p=egate.git

diff --git a/Makefile.web b/Makefile.web
index dee1d15..98e5bbb 100644
--- a/Makefile.web
+++ b/Makefile.web
@@ -1,25 +1,27 @@
 # Top level Makefile for the Web - Z39.50 gateway
 # Europagate, 1995-1996.
 #
-# $Id: Makefile.web,v 1.2 1996/08/28 08:33:45 adam Exp $
+# $Id: Makefile.web,v 1.9 2001/02/26 10:35:39 adam Exp $
 #
 SHELL=/bin/sh
 MAKE=make
 #CC=cc
 CPP=$(CC) -E
 
-VERSION=1.0
+VERSION=1.1
 
 # Install directories
-HTTPDDIR=/usr/local/etc/httpd
+HTTPDDIR=/var/lib/httpd
 CGIDIR=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
 EGWDIR=$(HTTPDDIR)/egw
 GIFDIR=$(HTDOCS)/egwgif
 
+EGWUSER=nobody
+
 # Location of Tcl
-TCLLIB=/usr/local/lib/libtcl7.5.a -lm
-TCLINC=-I/usr/local/include
+TCLLIB=-ltcl8.3 -lm
+TCLINC=
 
 # Location of IrTcl
 IRTCLDIR=../../ir-tcl
@@ -27,11 +29,11 @@ IRTCLLIB=$(IRTCLDIR)/libirtcl.a
 IRTCLINC=-I$(IRTCLDIR)
 
 # Other libraries needed on some systems
-#ELIB=-lnsl -lsocket
+#ELIBS=-lnsl -lsocket
 
 # If you are using YAZ uncomment these lines
 ZINC=-I../../yaz/include
-ZLIB=../../yaz/lib/libyaz.a
+ZLIB=../../yaz/lib/.libs/libyaz.a
 ZDEFS=
 
 # End of settings ---------------------------------------------
@@ -40,13 +42,13 @@ ZDEFS=
 SUBDIR=res+log util www
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" ELIB="$(ELIB)" ZDEFS="$(ZDEFS)" TCLLIB="$(TCLLIB)" TCLINC="$(TCLINC)" IRTCLLIB="$(IRTCLLIB)" IRTCLINC="$(IRTCLINC)" EGWDIR="$(EGWDIR)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" ELIBS="$(ELIBS)" ZDEFS="$(ZDEFS)" TCLLIB="$(TCLLIB)" TCLINC="$(TCLINC)" IRTCLLIB="$(IRTCLLIB)" IRTCLINC="$(IRTCLINC)" EGWDIR="$(EGWDIR)"; then cd ..; else exit 1; fi; done
 
 dep depend:
 	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" CPP="$(CPP)" ZDEFS="$(ZDEFS)" TCLINC="$(TCLINC)" IRTCLINC="$(IRTCLINC)" depend; then cd ..; else exit 1; fi; done
 
 install:
-	cd www; $(MAKE) HTTPDDIR="$(HTTPDDIR)" CGIDIR="$(CGIDIR)" HTDOCS="$(HTDOCS)" EGWDIR="$(EGWDIR)" GIFDIR="$(GIFDIR)" install
+	cd www; $(MAKE) HTTPDDIR="$(HTTPDDIR)" CGIDIR="$(CGIDIR)" HTDOCS="$(HTDOCS)" EGWDIR="$(EGWDIR)" GIFDIR="$(GIFDIR)" EGWUSER="$(EGWUSER)" install
 
 clean:
 	-rm -f lib/*.a
@@ -83,8 +85,10 @@ distribution:
 	mkdir tmp; cd tmp; cvs export -f -D now egate
 	cd tmp/egate; rm -fr ccl fml zlayer zlayer-yaz zlayer-zdist kernel
 	cd tmp/egate; rm *.email
+	cd tmp/egate; rm zdist.patch
 	cd tmp/egate/www; rm *wais*.[ch]
 	cd tmp/egate; mv Makefile.web Makefile
+	cd tmp/egate; mv CHANGELOG.web CHANGELOG
 	cd tmp/egate; mv README.web README
 	cd tmp; mv egate web-z39-$(VERSION)
 	cd tmp/web-z39-$(VERSION); make taildepend