More work on target definitons.

[egate.git] / www / Makefile

diff --git a/www/Makefile b/www/Makefile
index 72b8528..ab73261 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,14 +1,14 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.22 1996/01/09 16:16:47 adam Exp $
+# $Id: Makefile,v 1.26 1996/01/24 16:59:27 adam Exp $
 #
 SHELL=/bin/sh
 #
 ZDEFS=
 ZINC=-I../../yaz/include
 ZLIB=../../yaz/lib/libyaz.a
-#MOSILIB=../../xtimosi/src/libmosi.a -lrfc
+MOSILIB=../../xtimosi/src/libmosi.a -lrfc
 LIBIRTCL=../../ir-tcl/libirtcl.a $(ZLIB) $(MOSILIB)
 #NETLIB=-lnsl -lsocket
 #
@@ -17,7 +17,7 @@ TCLLIB=/usr/local/lib/libtcl7.4.a
 TCLINC=-I/usr/local/include
 #
 WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
- mtargets.egw mquery.egw msearch.egw history.egw
+ mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw
 HSCRIPTS=egwindex.html
 CONFFILES=ztargets.conf
 TPROG1=egwcgi
@@ -33,7 +33,7 @@ CGIDIR=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
 EGWDIR=$(HTTPDDIR)/egw
 LOGDIR=$(HTTPDDIR)/logs
-GIFDIR=$(HTDICS)/egwgif
+GIFDIR=$(HTDOCS)/egwgif
 
 #HTTPDDIR=/usr/local/www
 #CGIDIR=/usr/local/www/cgi-bin
@@ -48,15 +48,15 @@ DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \
 
 all: $(TPROG1) $(TPROG2)
 
-$(TPROG1): $(P1)
-       $(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB)
+$(TPROG1): $(P1) $(OLIB)
+       $(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB) $(ZLIB)
 
-$(TPROG2): $(P2)
+$(TPROG2): $(P2) $(OLIB)
        $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
                $(NETLIB) $(TCLLIB) -lm
 
-$(TPROG3): $(P3)
-       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
+$(TPROG3): $(P3) $(OLIB)
+       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB)
 
 install: install.prog install.script
 
@@ -88,6 +88,10 @@ install.script:
                echo Installing $$x; \
                cp $$x $(EGWDIR); \
        done
+       @if [ ! -d $(GIFDIR) ]; then \
+               echo "Making directory $(GIFDIR)"; \
+               mkdir $(GIFDIR); \
+       fi        
        @for x in gif/*.gif; do \
                echo Installing $$x; \
                cp $$x $(GIFDIR); \