New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.

[egate.git] / www / Makefile

diff --git a/www/Makefile b/www/Makefile
index 7b2a2b5..8f8307b 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.20  1996/01/03 15:19:35  adam
+# Revision 1.21  1996/01/09 10:46:48  adam
+# New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.
+#
+# Revision 1.20  1996/01/03  15:19:35  adam
 # Improved history.
 # Better working scan.
 # New maintanance function to print contact info, etc.
@@ -79,7 +82,7 @@ SHELL=/bin/sh
 #
 ZDEFS=
 #ZINC=-I../../yaz/include
-ZLIB=-lyaz
+ZLIB=../../yaz/lib/libyaz.a
 MOSILIB=../../xtimosi/src/libmosi.a -lrfc
 LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB)
 #NETLIB=-lnsl -lsocket
@@ -98,16 +101,19 @@ P1=wcgi.o
 P2=wproto.o winterp.o wsh.o wtcl.o whtml.o wirtcl.o
 P3=wproto.o wtest.o
 CPP=$(CC) -E
-#
-INCLUDE=-I../include $(ZINC)
-DEFS=$(INCLUDE) $(ZDEFS)
 
 HTTPDDIR=/usr/local/etc/httpd
-CGIBIN=$(HTTPDDIR)/cgi-bin
+CGIDIR=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
 CONFDIR=$(HTTPDDIR)/conf
+EGWDIR=$(HTTPDDIR)/egw
+LOGDIR=$(HTTPDDIR)/egw
 GIFDIR=$(HTDOCS)/gif
 
+INCLUDE=-I../include $(ZINC)
+DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \
+ -DLOGDIR=\"$(LOGDIR)\"
+
 all: $(TPROG1) $(TPROG2)
 
 $(TPROG1): $(P1)
@@ -125,18 +131,22 @@ install: install.prog install.script
 install.prog: $(TPROG1) $(TPROG2)
        @for x in $(TPROG1) $(TPROG2); do \
                echo Installing $$x; \
-               cp $$x $(CGIBIN); \
-               chmod +x $(CGIBIN)/$$x; \
+               cp $$x $(CGIDIR); \
+               chmod +x $(CGIDIR)/$$x; \
        done; \
        for p in egwtcl egwirtcl egwhtml; do \
-               rm -f $(CGIBIN)/$$p; \
-               ln $(CGIBIN)/$(TPROG2) $(CGIBIN)/$$p; \
+               rm -f $(CGIDIR)/$$p; \
+               ln $(CGIDIR)/$(TPROG2) $(CGIDIR)/$$p; \
        done
 
 install.script:
+       @if [ ! -d $(EGWDIR) ]; then \
+               echo "Making directory $(EGWDIR)"; \
+               mkdir $(EGWDIR); \
+       fi        
        @for x in $(WSCRIPTS); do \
                echo Installing $$x; \
-               cp $$x $(CGIBIN); \
+               cp $$x $(EGWDIR)/$$x; \
        done
        @for x in $(HSCRIPTS); do \
                echo Installing $$x; \