X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2FMakefile;h=dc58610b3484692476948764a68e873791418f3a;hb=7c2d86a77557592c7dd8d5415d8345f9bb74661c;hp=2512b12b3a704ce2209b4c1c77acecdb42cb8e9f;hpb=4e16cbb4035cc015e6c74f13aa49e97360dc0643;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index 2512b12..dc58610 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,25 +1,26 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.28 1996/01/31 16:01:45 adam Exp $
+# $Id: Makefile,v 1.29 1996/02/12 10:10:27 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 -I/usr/local/include 
 #
 WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
  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,8 +44,7 @@ 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)
 
@@ -65,14 +65,23 @@ install.prog: $(TPROG1) $(TPROG2)
 		echo "Making directory $(CGIDIR)"; \
 		mkdir $(CGIDIR); \
 	fi        
-	@for x in $(TPROG1) $(TPROG2); do \
+	@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:
@@ -80,7 +89,7 @@ install.script:
 		echo "Making directory $(EGWDIR)"; \
 		mkdir $(EGWDIR); \
 	fi        
-	@if [ ! -d $(HTDOCS); then \
+	@if [ ! -d $(HTDOCS) ]; then \
 		echo "Making directory $(HTDOCS)"; \
 		mkdir $(HTDOCS); \
 	fi