--- ucb/compress/Makefile.ORIG	Thu Jan 21 14:43:03 1999
+++ ucb/compress/Makefile	Thu Oct  9 17:35:36 2003
@@ -5,9 +5,9 @@
 #
 #	@(#)Makefile	5.11	(Berkeley)	1/21/99
 #
-CFLAGS=	-O -DBSD4_2 -DBITS=16
-LIBC=	/lib/libc.a
-LIBZ=	/usr/lib/libz.a
+CFLAGS=	-O -DBSD4_2 -DBITS=16 -I../../include -L../../usr.lib/libz
+# LIBC=	/lib/libc.a
+# LIBZ=	/usr/lib/libz.a
 SRCS=	compress.c gzcompat.c
 OBJS=	compress.o gzcompat.o
 
--- usr.lib/libz/Makefile.ORIG	Thu Sep 30 04:53:24 1999
+++ usr.lib/libz/Makefile	Mon Oct  6 22:22:17 2003
@@ -2,7 +2,7 @@
 #
 #	@(#)Makefile	5.2 (Berkeley) 1/19/99
 
-CFLAGS=	-O
+CFLAGS=	-O -I../../include
 LIBC=	/lib/libc.a
 SRCS=	adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
 	zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c \
@@ -25,29 +25,29 @@
 # some VAX assembly first...
 
 trees.o: trees.c
-	@${CC} -c -pg trees.c
+	@${CC} -c -pg ${CFLAGS} trees.c
 	@ld -x -o profiled/trees.o -r trees.o
-	${CC} -c trees.c
+	${CC} ${CFLAGS} -c trees.c
 	@ld -x -r trees.o
 	@mv a.out trees.o
 
 infblock.o: infblock.c
-	@${CC} -c -pg infblock.c
+	@${CC} -c -pg ${CFLAGS} infblock.c
 	@ld -x -o profiled/infblock.o -r infblock.o
-	${CC} -c infblock.c
+	${CC} ${CFLAGS} -c infblock.c
 	@ld -x -r infblock.o
 	@mv a.out infblock.o
 
 libz libz_p: ${OBJS}
 	@echo building profiled libz
-	@cd profiled; ar cu ../libz_p ${OBJS}
+	@cd profiled; ar cru ../libz_p ${OBJS}
 	ranlib libz_p
-	@echo building normal libz
-	@ar cu libz ${OBJS}
-	ranlib libz
+	@echo building normal libz.a
+	@ar cru libz.a ${OBJS}
+	ranlib libz.a
 
 clean: FRC
-	rm -f ${OBJS} profiled/*.o libz libz_p
+	rm -f ${OBJS} profiled/*.o libz.a libz_p
 
 depend: FRC
 	mkdep ${CFLAGS} ${SRCS}
--- usr.lib/libz/zutil.h.ORIG	Mon Jan 18 14:37:47 1999
+++ usr.lib/libz/zutil.h	Thu Oct  9 17:33:17 2003
@@ -71,9 +71,11 @@
 #endif
 
          /* functions */
-
+#if !defined(__linux__)
 extern char *sys_errlist[];
 extern int sys_nerr;
+#endif
+
 #define zstrerror(errnum) ((errnum) > sys_nerr ? "" : sys_errlist[(errnum)])
 
 #define HAVE_MEMCPY