Minor changes.

[egate.git] / www / Makefile

diff --git a/www/Makefile b/www/Makefile
index 000302e..bc47ff9 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,25 +1,24 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.34 1996/03/07 12:46:07 adam Exp $
+# $Id: Makefile,v 1.41 1996/06/06 11:10:10 adam Exp $
 #
 SHELL=/bin/sh
 
 ZLIB=../../yaz/lib/libyaz.a
+ZINC=-I../../yaz/include
 
 IRTCLDIR=../../ir-tcl
 IRTCLLIB=$(IRTCLDIR)/libirtcl.a
 IRTCLINC=-I$(IRTCLDIR)
 
 #MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
-#NETLIB=-lnsl -lsocket
+#ELIB=-lnsl -lsocket
 
 OLIB=../lib/util.a ../lib/libres+log.a 
 TCLLIB=/usr/local/lib/libtcl7.5.a
 TCLINC=
 
-WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
- mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw sameas.egw
 HSCRIPTS=egwindex.html
 CONFFILES=egw.res ztargets.conf
 TPROG1=egwcgi
@@ -36,17 +35,15 @@ HTTPDDIR=/usr/local/etc/httpd
 CGIDIR=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
 EGWDIR=$(HTTPDDIR)/egw
-LOGDIR=$(HTTPDDIR)/logs
 GIFDIR=$(HTDOCS)/egwgif
 
 #HTTPDDIR=/usr/local/www
 #CGIDIR=/usr/local/www/cgi-bin
 #HTDOCS=/data2/html/egw/html
 #EGWDIR=/data2/html/egw/scripts
-#LOGDIR=/data2/html/egw/logs
 #GIFDIR=/data2/html/egw/gif
 
-INCLUDE=-I../include $(TCLINC) $(IRTCLINC)
+INCLUDE=-I../include $(ZINC) $(TCLINC) $(IRTCLINC)
 DEFS=$(INCLUDE) $(ZDEFS) -DEGWDIR=\"$(EGWDIR)\"
 
 all: $(TPROG1) $(TPROG2)
@@ -56,10 +53,10 @@ $(TPROG1): $(P1) $(OLIB)
 
 $(TPROG2): $(P2) $(OLIB)
        $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(IRTCLLIB) \
-               $(ZLIB) $(MOSILIB) $(NETLIB) $(TCLLIB) -lm
+               $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) 
 
 $(TPROG3): $(P3) $(OLIB)
-       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
+       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ELIB)
 
 
 WAISDIR=../../freeWAIS-sf-2.0
@@ -68,11 +65,11 @@ WAISLIB=$(IRTCLDIR)/wais-tcl.o $(WAISDIR)/ir/libwais.a
 $(TPROG4): $(P4) $(OLIB)
        $(CC) $(CFLAGS) -o $(TPROG4) $(P4) \
                $(OLIB) $(IRTCLLIB) \
-               $(WAISLIB) $(ZLIB) $(MOSILIB) $(NETLIB) $(TCLLIB) -lm
+               $(WAISLIB) $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) 
 
 install: install.prog install.script install.gif
 
-install.prog: $(TPROG1) $(TPROG2)
+install.prog: 
        @if [ ! -d $(CGIDIR) ]; then \
                echo "Making directory $(CGIDIR)"; \
                mkdir $(CGIDIR); \
@@ -110,7 +107,7 @@ install.script:
                echo "Making directory $(HTDOCS)"; \
                mkdir $(HTDOCS); \
        fi        
-       @for x in $(WSCRIPTS); do \
+       @for x in *.egw *.tcl; do \
                echo Installing $$x; \
                cp $$x $(EGWDIR)/$$x; \
        done