--- GNUmakefile.orig	Sat May 21 18:16:04 2005
+++ GNUmakefile	Sat May 21 18:19:41 2005
@@ -4,22 +4,16 @@
 # in /opt/diet, where they are in the default search path for my diet libc
 # work but don't conflict with anything there.  YMMV.
 
-prefix=/opt/diet
+prefix=${PREFIX}
 LIBDIR=${prefix}/lib
-INCLUDEDIR=${prefix}/include
-MAN3DIR=${prefix}/man/man3
+INCLUDEDIR=${prefix}/include/libowfat
+MAN3DIR=${MANPREFIX}/man/man3
 
 LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
 buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a textcode.a
 
 all: t $(LIBS) libowfat.a libsocket
 
-CC=gcc
-CFLAGS=-pipe -W -Wall -O2 -fomit-frame-pointer
-#CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
-
-# CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
-
 # startrip
 ifneq ($(DEBUG),)
 CFLAGS=-pipe -Wall -g
@@ -154,10 +148,10 @@
 errmsg.h
 
 install: libowfat.a
-	install -d $(INCLUDEDIR) $(MAN3DIR) $(LIBDIR)
-	install -m 644 $(INCLUDES) $(INCLUDEDIR)
-	install -m 644 $(wildcard */*.3) $(MAN3DIR)
-	install -m 644 libowfat.a $(LIBDIR)
+	${INSTALL} -d $(INCLUDEDIR) $(MAN3DIR) $(LIBDIR)
+	${BSD_INSTALL_DATA} $(INCLUDES) $(INCLUDEDIR)
+	${BSD_INSTALL_MAN} $(wildcard */*.3) $(MAN3DIR)
+	${BSD_INSTALL_DATA} libowfat.a $(LIBDIR)
 
 uninstall:
 	rm -f $(patsubst %.h,$(INCLUDEDIR)/%.h,$(INCLUDES))