--- Makefile.orig	Sun Nov 19 16:12:17 2000
+++ Makefile	Fri Jan  5 17:00:06 2001
@@ -1,4 +1,4 @@
-CC = gcc -O2 -Wall
+CFLAGS += -Wall
 VER = 0.07
 RPM_ROOT = /home/wojtekka/rpm
 
@@ -6,9 +6,9 @@
 	@echo -e -- \\033[1m6tunnel\\033[0m make --
 	@if [ -d /usr/local/v6/lib ]; then make KAME; else make generic; fi
 generic:
-	$(CC) 6tunnel.c -o 6tunnel
+	$(CC) $(CFLAGS) 6tunnel.c -o 6tunnel
 KAME:
-	$(CC) 6tunnel.c -o 6tunnel -L/usr/local/v6/lib -linet6
+	$(CC) $(CFLAGS) 6tunnel.c -o 6tunnel -L/usr/local/v6/lib -linet6
 
 install:
 	@case $$(uname -s) in \
@@ -21,10 +21,10 @@
 	install 6tunnel /usr/local/bin
 	install	6tunnel.1 /usr/local/man/man1
 
-install-bsd:	default
+install-bsd:
 	strip 6tunnel
-	install 6tunnel /usr/local/bin
-	install	6tunnel.1 /usr/local/share/man/man1
+	${BSD_INSTALL_PROGRAM} 6tunnel ${PREFIX}/bin
+	${BSD_INSTALL_MAN} 6tunnel.1 ${PREFIX}/man/man1
 	
 targz:	clean
 	cd ..; tar zcvf 6tunnel/6tunnel-$(VER).tar.gz --exclude 6tunnel/6tunnel-$(VER).tar.gz --exclude 6tunnel/older 6tunnel