X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=b1285eadbba9aa508a322fd47fc47420facfe150;hb=5e3100c03c68fd3192bbcef8de7c3b9488b4d3c3;hp=0017069a83e8b68fb8d4cad9a22a6b2c22769fa0;hpb=077cc4d735856a5e9c31e16ee75d28e85c67ac62;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index 0017069..b1285ea 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,25 +1,24 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.33 1996/03/05 18:50:24 adam Exp $
+# $Id: Makefile,v 1.42 1997/01/24 13:13: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
+TCLLIB=-L/usr/local/lib -ltcl8.0 -lm
 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
 HSCRIPTS=egwindex.html
 CONFFILES=egw.res ztargets.conf
 TPROG1=egwcgi
@@ -32,21 +31,14 @@ P3=wproto.o wtest.o
 P4=wproto.o winterp.o waissh.o wtcl.o wirtcl.o wshmain.o wwaistcl.o
 CPP=$(CC) -E
 
+EGWUSER=nobody
 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 +48,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 +60,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); \
@@ -81,24 +73,30 @@ install.prog: $(TPROG1) $(TPROG2)
 		echo "Making directory $(EGWDIR)"; \
 		mkdir $(EGWDIR); \
 	fi        
+	@chown $(EGWUSER) $(EGWDIR)
 	@for x in $(TPROG1); do \
 		echo Installing $$x; \
 		cp $$x $(CGIDIR); \
-		chmod a+x $(CGIDIR)/$$x; \
+                chown $(EGWUSER) $(CGIDIR)/$$x; \
+		chmod +x $(CGIDIR)/$$x; \
+		chmod u+s $(CGIDIR)/$$x; \
 	done; \
 	for x in $(TPROG2); do \
 		echo Installing $$x; \
-		cp $$x $(EGWDIR); \
-		chmod a+x $(EGWDIR)/$$x; \
+		cp $$x $(EGWDIR)/$$x; \
+                chown $(EGWUSER) $(EGWDIR)/$$x; \
+		chmod +x $(EGWDIR)/$$x; \
 	done; \
 	for p in egwtcl egwirtcl egwhtml; do \
 		rm -f $(EGWDIR)/$$p; \
 		ln $(EGWDIR)/$(TPROG2) $(EGWDIR)/$$p; \
+                chown $(EGWUSER) $(EGWDIR)/$$p; \
 	done
 	@if [ -x $(TPROG4) ]; then \
 		echo Installing $(TPROG4); \
 		cp $(TPROG4) $(EGWDIR)/$(TPROG4); \
-		chmod a+x $(EGWDIR)/$(TPROG4); \
+		chmod +x $(EGWDIR)/$(TPROG4); \
+                chown $(EGWUSER) $(EGWDIR)/$(TPROG4); \
 	fi
 
 install.script:
@@ -110,27 +108,32 @@ 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; \
+		chown $(EGWUSER) $(EGWDIR)/$$x; \
 	done
 	@for x in $(HSCRIPTS); do \
 		echo Installing $$x; \
 		cp $$x $(HTDOCS); \
+                chmod a+r $(HTDOCS)/$$x; \
 	done
 	@for x in $(CONFFILES); do \
 		echo Installing $$x; \
 		cp $$x $(EGWDIR); \
+                chown $(EGWUSER) $(EGWDIR)/$$x; \
 	done
 
 install.gif:
 	@if [ ! -d $(GIFDIR) ]; then \
 		echo "Making directory $(GIFDIR)"; \
 		mkdir $(GIFDIR); \
+		chmod a+x $(GIFDIR); \
 	fi        
-	@for x in gif/*.gif; do \
+	@cd gif; for x in *.gif; do \
 		echo Installing $$x; \
 		cp $$x $(GIFDIR); \
+                chmod a+r $(GIFDIR)/$$x; \
 	done
 
 .c.o: