From 373495ef158d123d95ab44465d4249e65847492b Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 31 May 1996 08:02:20 +0000
Subject: [PATCH] Minor changes.

---
 Makefile        |   14 +++++++-------
 kernel/Makefile |    9 ++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 86c1331..e02df89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Top level Makefile for the Z39.50 gateway (WWW and email)
 # Europagate, 1994-1995.
 #
-# $Id: Makefile,v 1.30 1996/04/25 10:21:24 adam Exp $
+# $Id: Makefile,v 1.31 1996/05/31 08:02:20 adam Exp $
 #
 SHELL=/bin/sh
 MAKE=make
@@ -27,7 +27,7 @@ EGWDIR=$(HTTPDDIR)/egw
 GIFDIR=$(HTDOCS)/egwgif
 
 # Location of Tcl
-TCLLIB=/usr/local/lib/libtcl7.5.a
+TCLLIB=/usr/local/lib/libtcl7.5.a -ldl
 TCLINC=
 
 # Location of IrTcl
@@ -38,7 +38,7 @@ IRTCLINC=-I$(IRTCLDIR)
 # Common settings ---------------------------------------------
 
 # Other libraries libraries needed on some systems
-#NETLIB=-lnsl -lsocket
+#ELIB=-lnsl -lsocket
 
 # If you are using YAZ uncomment these lines
 ZACC=zlayer-yaz
@@ -58,16 +58,16 @@ ZDEFS=
 SUBDIR=res+log util ccl fml $(ZACC) kernel www
 
 SUBDIREMAIL=res+log util ccl fml $(ZACC) kernel
-SUBDIRWWW=res+log util $(ZACC) www
+SUBDIRWWW=res+log util www
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" NETLIB="$(NETLIB)" REGEXOBJ="$(REGEXOBJ)" REGEXINC="$(REGEXINC)" 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)" ELIB="$(ELIB)" REGEXOBJ="$(REGEXOBJ)" REGEXINC="$(REGEXINC)" ZDEFS="$(ZDEFS)" TCLLIB="$(TCLLIB)" TCLINC="$(TCLINC)" IRTCLLIB="$(IRTCLLIB)" IRTCLINC="$(IRTCLINC)" EGWDIR="$(EGWDIR)"; then cd ..; else exit 1; fi; done
 
 email:
-	for i in $(SUBDIREMAIL); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" NETLIB="$(NETLIB)" REGEXOBJ="$(REGEXOBJ)" REGEXINC="$(REGEXINC)" ZDEFS="$(ZDEFS)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIREMAIL); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" ELIB="$(ELIB)" REGEXOBJ="$(REGEXOBJ)" REGEXINC="$(REGEXINC)" ZDEFS="$(ZDEFS)"; then cd ..; else exit 1; fi; done
 
 egw:
-	for i in $(SUBDIRWWW); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" NETLIB="$(NETLIB)" ZDEFS="$(ZDEFS)" TCLLIB="$(TCLLIB)" TCLINC="$(TCLINC)" IRTCLLIB="$(IRTCLLIB)" IRTCLINC="$(IRTCLINC)" EGWDIR="$(EGWDIR)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIRWWW); 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
 
 dep depend:
 	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" CPP="$(CPP)" REGEXINC="$(REGEXINC)" ZDEFS="$(ZDEFS)" TCLINC="$(TCLINC)" IRTCLINC="$(IRTCLINC)" depend; then cd ..; else exit 1; fi; done
diff --git a/kernel/Makefile b/kernel/Makefile
index 6f1e5cb..7d8d3e6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,6 +2,9 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
+# Revision 1.30  1996/05/31 08:02:26  adam
+# Minor changes.
+#
 # Revision 1.29  1996/05/22 08:37:21  adam
 # Removed CFLAGS definition.
 #
@@ -122,13 +125,13 @@ USELIBS3=../lib/libres+log.a ../lib/util.a
 all: $(PROG1) $(PROG2) $(PROG3)
 
 $(PROG1): $(O1) $(USELIBS1)
-	$(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(ZLIB) $(NETLIB)
+	$(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(ZLIB) $(ELIB)
 
 $(PROG2): $(O2) $(USELIBS2)
-	$(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS2) $(ZLIB) $(NETLIB)
+	$(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS2) $(ZLIB) $(ELIB)
 
 $(PROG3): $(O3) $(USELIBS3)
-	$(CC) $(CFLAGS) -o $(PROG3) $(O3) $(USELIBS3) $(ZLIB) $(NETLIB)
+	$(CC) $(CFLAGS) -o $(PROG3) $(O3) $(USELIBS3) $(ZLIB) $(ELIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
-- 
1.7.10.4