X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=e473d744dee8b9d2b4e9439e979abf11cf18abb9;hb=3c1a04c3c1aa9f80cd7b3f9a884968e6fc1b7220;hp=568be3c30c60089e6f81dd4ccfd6eb844b21975a;hpb=2ffd22f0b11ad4c3e2df52a3a5db17046655d8c8;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index 568be3c..e473d74 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,25 +1,26 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.23 1996/01/09 17:14:34 adam Exp $
+# $Id: Makefile,v 1.31 1996/02/20 16:07:39 adam Exp $
 #
 SHELL=/bin/sh
 #
 ZDEFS=
-ZINC=-I../../yaz/include
+#ZINC=-I../../yaz/include
 ZLIB=../../yaz/lib/libyaz.a
-MOSILIB=../../xtimosi/src/libmosi.a -lrfc
+#ZLIB=-lyaz
+#MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 LIBIRTCL=../../ir-tcl/libirtcl.a $(ZLIB) $(MOSILIB)
 #NETLIB=-lnsl -lsocket
 #
 OLIB=../lib/util.a ../lib/libres+log.a 
-TCLLIB=/usr/local/lib/libtcl7.4.a
-TCLINC=-I/usr/local/include
+TCLLIB=/usr/local/lib/libtcl7.5.a
+TCLINC=-I../../ir-tcl 
 #
 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
+CONFFILES=egw.res ztargets.conf
 TPROG1=egwcgi
 TPROG2=egwsh
 TPROG3=wtest
@@ -43,32 +44,44 @@ GIFDIR=$(HTDOCS)/egwgif
 #GIFDIR=/data2/html/egw/gif
 
 INCLUDE=-I../include $(ZINC) $(TCLINC)
-DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \
- -DLOGDIR=\"$(LOGDIR)\"
+DEFS=$(INCLUDE) $(ZDEFS) -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
+install: install.prog install.script install.gif
 
 install.prog: $(TPROG1) $(TPROG2)
-	@for x in $(TPROG1) $(TPROG2); do \
+	@if [ ! -d $(CGIDIR) ]; then \
+		echo "Making directory $(CGIDIR)"; \
+		mkdir $(CGIDIR); \
+	fi        
+	@if [ ! -d $(EGWDIR) ]; then \
+		echo "Making directory $(EGWDIR)"; \
+		mkdir $(EGWDIR); \
+	fi        
+	@for x in $(TPROG1); do \
 		echo Installing $$x; \
 		cp $$x $(CGIDIR); \
 		chmod a+x $(CGIDIR)/$$x; \
 	done; \
+	for x in $(TPROG2); do \
+		echo Installing $$x; \
+		cp $$x $(EGWDIR); \
+		chmod a+x $(EGWDIR)/$$x; \
+	done; \
 	for p in egwtcl egwirtcl egwhtml; do \
-		rm -f $(CGIDIR)/$$p; \
-		ln $(CGIDIR)/$(TPROG2) $(CGIDIR)/$$p; \
+		rm -f $(EGWDIR)/$$p; \
+		ln $(EGWDIR)/$(TPROG2) $(EGWDIR)/$$p; \
 	done
 
 install.script:
@@ -76,6 +89,10 @@ install.script:
 		echo "Making directory $(EGWDIR)"; \
 		mkdir $(EGWDIR); \
 	fi        
+	@if [ ! -d $(HTDOCS) ]; then \
+		echo "Making directory $(HTDOCS)"; \
+		mkdir $(HTDOCS); \
+	fi        
 	@for x in $(WSCRIPTS); do \
 		echo Installing $$x; \
 		cp $$x $(EGWDIR)/$$x; \
@@ -88,6 +105,8 @@ install.script:
 		echo Installing $$x; \
 		cp $$x $(EGWDIR); \
 	done
+
+install.gif:
 	@if [ ! -d $(GIFDIR) ]; then \
 		echo "Making directory $(GIFDIR)"; \
 		mkdir $(GIFDIR); \