--- Makefile.orig Fri Mar 31 08:07:54 2000 +++ Makefile Wed Jun 7 10:57:22 2000 @@ -5,16 +5,16 @@ # The path to install squirm under -PREFIX=/usr/local/squirm +#PREFIX=/usr/local/squirm # The username that squid runs as (see cache_effective_user in squid.conf) -USER=squid +USER=$(SQUID_UID) # The group that squid runs as (see cache_effective_group in squid.conf) -GROUP=squid +GROUP=$(SQUID_GID) # The group that the root user belongs to -ROOT_GROUP = bin +ROOT_GROUP = wheel # The regex library (-lgnuregex is common on FreeBSD, none for some Linux'es) EXTRALIBS=-lgnuregex @@ -29,26 +29,25 @@ OFILES = squirm.o main.o config.o log.o lists.o ip.o util.o HFILES = squirm.h paths.h lists.h log.h ip.h util.h -CC=gcc +CC?=gcc -OPTIMISATION=-O3 +OPTIMISATION= BINARIES = squirm -CFLAGS = -O3 -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\" +CFLAGS += -g -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\" #CFLAGS = -Wall -g -DPREFIX=\"$(PREFIX)\" #CFLAGS = -Wall -g -DDEBUG all: $(BINARIES) install: all - install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX) \ - $(PREFIX)/bin - install -m 770 -o root -g $(GROUP) -d $(PREFIX)/etc - install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/logs - install -m 660 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \ - $(PREFIX)/etc - install -m 755 -o root -g $(ROOT_GROUP) --strip squirm $(PREFIX)/bin + install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX)/squirm + install -m 750 -o root -g $(GROUP) -d $(PREFIX)/etc/squirm + install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/squirm/logs + install -m 640 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \ + $(PREFIX)/etc/squirm + $(BSD_INSTALL_PROGRAM) squirm $(PREFIX)/bin squirm.o: squirm.c $(HFILES) $(CC) -c squirm.c $(CFLAGS)