diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-06-22 17:24:35 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-06-22 17:24:35 +0000 |
| commit | 8b3efb3301a3041800fd9b94121de6f11ade1dbb (patch) | |
| tree | 60abad37f36e46b22d29f83ebe31f7132b5624a0 /www/squirm | |
| parent | Don't require interaction on install while PACKAGE_BUILDING. (diff) | |
Fixup patch botch from previous commit.
Notes
Notes:
svn path=/head/; revision=19663
Diffstat (limited to 'www/squirm')
| -rw-r--r-- | www/squirm/files/patch-aa | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/squirm/files/patch-aa b/www/squirm/files/patch-aa index efa9f1b59963..b60e6b909869 100644 --- a/www/squirm/files/patch-aa +++ b/www/squirm/files/patch-aa @@ -1,7 +1,6 @@ -diff -ruN ../squirm-1.0betaB.orig/Makefile.real ./Makefile.real ---- Makefile.real.orig Wed Mar 11 10:23:51 1998 -+++ Makefile.real Tue May 25 17:15:36 1999 -@@ -1,31 +1,30 @@ +--- Makefile.real.orig Wed Mar 11 02:23:51 1998 ++++ Makefile.real Thu Jun 17 18:13:00 1999 +@@ -1,31 +1,31 @@ # Makefile for Squirm # @@ -12,17 +11,18 @@ diff -ruN ../squirm-1.0betaB.orig/Makefile.real ./Makefile.real +HFILES = squirm.h paths.h lists.h log.h #regex.h -CC=gcc -+CC?=cc ++PREFIX?= /usr/local ++CC?= cc #CC=checkergcc --#EXTRALIBS=-lregex -+EXTRALIBS=-lgnuregex - #EXTRALIBS= + #EXTRALIBS=-lregex +-#EXTRALIBS= ++EXTRALIBS= -lgnuregex BINARIES = squirm -CFLAGS = -O3 -Wall -funroll-loops -+CFLAGS? = -O3 -Wall -funroll-loops ++CFLAGS?= -O3 -Wall -funroll-loops #CFLAGS = -Wall -g all: $(BINARIES) @@ -30,17 +30,17 @@ diff -ruN ../squirm-1.0betaB.orig/Makefile.real ./Makefile.real install: all - install -m 755 -o root -g root -d /usr/local/squirm \ - /usr/local/squirm/bin -- install -m 750 -o root -g squid -d /usr/local/squirm/etc +- install -m 770 -o root -g squid -d /usr/local/squirm/etc - install -m 750 -o squid -g squid -d /usr/local/squirm/logs - install -m 660 -o root -g squid squirm.local.dist squirm.patterns.dist \ - /usr/local/squirm/etc - install -m 755 -o root -g root --strip squirm /usr/local/squirm/bin -+ install -c -m 755 -o root -g wheel -d ${PREFIX}/squirm -+ install -c -m 770 -o root -g wheel -d ${PREFIX}/etc/squirm -+ install -c -m 750 -o nobody -g nogroup -d ${PREFIX}/squirm/logs ++ install -c -m 755 -o root -g wheel -d $(PREFIX)/squirm ++ install -c -m 770 -o root -g wheel -d $(PREFIX)/etc/squirm ++ install -c -m 750 -o nobody -g nogroup -d $(PREFIX)/squirm/logs + install -c -m 660 -o root -g nogroup squirm.local.dist squirm.patterns.dist \ -+ ${PREFIX}/etc/squirm -+ install -c -m 755 -o root -g wheel --strip squirm ${PREFIX}/bin ++ $(PREFIX)/etc/squirm ++ install -c -m 755 -o root -g wheel --strip squirm $(PREFIX)/bin squirm.o: squirm.c $(HFILES) $(CC) -c squirm.c $(CFLAGS) |