summaryrefslogtreecommitdiff
path: root/www/analog/files/patch-aa
blob: 34f3b8af5543c453dd2e25d36a03c8886596b3bd (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
--- Makefile.orig	Tue Feb 13 07:09:08 2001
+++ Makefile	Wed Apr 11 17:28:09 2001
@@ -1,13 +1,13 @@
 # Makefile for analog 4.16
 # Please read docs/Readme.html, or http://www.analog.cx/
-CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
+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;
 #                    NeXTSTEP apparently needs...
 #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
-DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
+#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
 #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
 #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DHAVE_ADDR_T ...
 #                    ... -DNEED_FLOATINGPOINT_H
@@ -18,6 +18,10 @@
 #                    DYNIX/ptx reportedly needs -D_SOCKET_VERSION=11
 #                    MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
 #                    All the options are explained at the bottom of this file.
+DEFS =  -DANALOGDIR=\"$(PREFIX)/share/analog/\" \
+	-DLOGFILE=\"/var/log/httpd-access.log\" \
+	-DIMAGEDIR=\"/images/\" \
+	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\"
 OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS,
 #                    RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400
 LIBS =       # extra libraries needed; Solaris 2 (SunOS 5) needs
@@ -33,12 +37,12 @@
 	input.o macinput.o macstuff.o output.o output2.o pcre.o process.o \
 	settings.o sort.o tree.o utils.o win32.o
 HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h pcre.h
-CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
+CFLAGS += $(DEFS) -D$(OS)
 
 $(PROGRAM): $(OBJS) $(HEADERS) Makefile
 	$(CC) $(CEXTRAFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 	@echo '***'
-	@echo '***IMPORTANT: You must read the licence before using analog'
+	@echo '***IMPORTANT: You must read the license before using analog'
 	@echo '***'
 
 # There doesn't seem to be a good way to write all these rules in a generic