$NetBSD: patch-aa,v 1.6 1999/11/23 13:20:10 agc Exp $

--- Makefile.orig	Sun Nov 14 14:17:21 1999
+++ Makefile	Tue Nov 23 13:05:31 1999
@@ -2,10 +2,14 @@
 # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
 CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
 #                    compilers need different CFLAGS, e.g., -O instead of -O2.
-CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
+#CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
 #                    HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ...
 #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK
-DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
+DEFS = -DANALOGDIR=\"${PREFIX}/lib/analog/\" \
+       -DLOGFILE=\"/var/log/httpd-access.log\" \
+       -DIMAGEDIR=\"/images/\" \
+       -DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\"
+                   # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
 #                    ... -DEBCDIC -DNEED_STRCMP -DNEED_MEMMOVE ...
 #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
 #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
@@ -20,15 +24,21 @@
 #                    OS/2 with EMX requires LIBS = -lsocket; so does BS2000/OSD
 #                    SVR4 requires LIBS = -lsocket -lnsl
 
+OPSYS!= uname -s
+
+.if ${OPSYS} == "SunOS"
+LIBS+= -lsocket -lnsl
+.endif
+
 PROGRAM = analog
 OBJS = alias.o analog.o cache.o dates.o globals.o hash.o init.o init2.o \
 	input.o macinput.o macstuff.o output.o output2.o process.o settings.o \
 	sort.o tree.o utils.o win32.o
 HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
-CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
+CFLAGS += $(DEFS) -D$(OS)
 
 $(PROGRAM): $(OBJS) $(HEADERS) Makefile
-	$(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+	$(CC) $(OBJS) -o $(PROGRAM) $(LIBS)
 	@echo '***'
 	@echo '***IMPORTANT: You must read the licence before using analog'
 	@echo '***'