diff options
| author | leeym <leeym@FreeBSD.org> | 2003-06-25 10:44:50 +0800 |
|---|---|---|
| committer | leeym <leeym@FreeBSD.org> | 2003-06-25 10:44:50 +0800 |
| commit | 700c33fa1ef313caee06a3a3d88c7ee0ecbc95de (patch) | |
| tree | dbeee35db26c5aeab81abcf927d85e3bb785e741 /security/labrea/files | |
| parent | 408a44c30773e44f9522979f36fe71e24b9d536c (diff) | |
| download | freebsd-ports-gnome-700c33fa1ef313caee06a3a3d88c7ee0ecbc95de.tar.gz freebsd-ports-gnome-700c33fa1ef313caee06a3a3d88c7ee0ecbc95de.tar.zst freebsd-ports-gnome-700c33fa1ef313caee06a3a3d88c7ee0ecbc95de.zip | |
respect CC and CFLAGS, and unbreak LaBrea on ia64 and alpha.
refine description.
Noticed by: kris and bento
Diffstat (limited to 'security/labrea/files')
| -rw-r--r-- | security/labrea/files/patch-Makefile | 75 |
1 files changed, 22 insertions, 53 deletions
diff --git a/security/labrea/files/patch-Makefile b/security/labrea/files/patch-Makefile index e6a231a73390..b44a51908349 100644 --- a/security/labrea/files/patch-Makefile +++ b/security/labrea/files/patch-Makefile @@ -1,53 +1,22 @@ -*** Makefile Wed Feb 20 09:27:56 2002 ---- Makefile.new Wed Jun 11 18:10:47 2003 -*************** -*** 4,17 **** - -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer - #OPTFLAGS = -g - CC = gcc -! CFLAGS = -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES) - LDLIBS = `libnet-config --libs` -lpcap -! LDFLAGS = -s -! INCLUDES = -I/usr/include/pcap -! -! LaBrea: LaBrea.o CleanExit.o FixArrays.o GoDaemon.o \ -! PacketHandler.o ServiceTimer.o ToggleLogging.o - - LaBrea.o: LaBrea.c labrea.h defines.h - CleanExit.o: CleanExit.c labrea.h defines.h - FixArrays.o: FixArrays.c labrea.h defines.h ---- 4,17 ---- - -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer - #OPTFLAGS = -g - CC = gcc -! CFLAGS = -Wall `libnet-config --defines` -DCONFIG_PATH=\"/usr/local/etc\" $(OPTFLAGS) $(INCLUDES) - LDLIBS = `libnet-config --libs` -lpcap -! LDFLAGS = -s -L/usr/local/lib -! INCLUDES = -I/usr/include/pcap -I/usr/local/include -! FILES = LaBrea.o CleanExit.o FixArrays.o GoDaemon.o PacketHandler.o ServiceTimer.o ToggleLogging.o - -+ LaBrea: $(FILES) -+ - LaBrea.o: LaBrea.c labrea.h defines.h - CleanExit.o: CleanExit.c labrea.h defines.h - FixArrays.o: FixArrays.c labrea.h defines.h -*************** -*** 20,26 **** - ServiceTimer.o: ServiceTimer.c labrea.h defines.h - ToggleLogging.o: ToggleLogging.c labrea.h defines.h - - clean: - rm -f *.o core LaBrea -- - ---- 20,29 ---- - ServiceTimer.o: ServiceTimer.c labrea.h defines.h - ToggleLogging.o: ToggleLogging.c labrea.h defines.h - -+ install: -+ $(CC) -o LaBrea $(FILES) $(LDFLAGS) $(LDLIBS) -+ $(INSTALL) -c -o root -g wheel LaBrea /usr/local/bin -+ - clean: - rm -f *.o core LaBrea - +--- Makefile.orig Thu Feb 21 00:27:56 2002 ++++ Makefile Wed Jun 25 10:36:50 2003 +@@ -3,14 +3,15 @@ + OPTFLAGS = -O6 -funroll-loops -frerun-cse-after-loop -finline-functions \ + -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer + #OPTFLAGS = -g +-CC = gcc +-CFLAGS = -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES) ++CC ?= gcc ++CFLAGS += -Wall `libnet-config --defines` -DCONFIG_PATH=\"$(PREFIX)/etc\" $(INCLUDES) + LDLIBS = `libnet-config --libs` -lpcap +-LDFLAGS = -s +-INCLUDES = -I/usr/include/pcap ++LDFLAGS = -s -L$(PREFIX)/lib ++INCLUDES = -I/usr/include/pcap -I$(PREFIX)/include + + LaBrea: LaBrea.o CleanExit.o FixArrays.o GoDaemon.o \ + PacketHandler.o ServiceTimer.o ToggleLogging.o ++ $(CC) -o LaBrea $> $(LDFLAGS) $(LDLIBS) + + LaBrea.o: LaBrea.c labrea.h defines.h + CleanExit.o: CleanExit.c labrea.h defines.h |