2 files changed, 54 insertions, 15 deletions

diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index cc8a8f3088e4..2d1e575565c7 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,23 +1,62 @@
-# Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
-# even though it may live in src/gnu/...
-
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/cpio
+CPIODIR= ${.CURDIR}/../../../contrib/cpio
+.PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc
 
 SUBDIR=	doc
 
 PROG=	cpio
+SRCS=   copyin.c \
+	copyout.c \
+	copypass.c \
+	defer.c \
+	dstring.c \
+	filemode.c \
+	global.c \
+	idcache.c \
+	main.c \
+	makepath.c \
+	tar.c \
+	userspec.c \
+	util.c \
+	argp-ba.c \
+	argp-eexst.c \
+	argp-fmtstream.c \
+	argp-fs-xinl.c \
+	argp-help.c \
+	argp-parse.c \
+	argp-pv.c \
+	argp-pvh.c \
+	argp-xinl.c \
+	basename.c \
+	dirname.c \
+	error.c \
+	exitfail.c \
+	full-write.c \
+	getopt.c \
+	getopt1.c \
+	mempcpy.c \
+	rtapelib.c \
+	safe-read.c \
+	safe-write.c \
+	strchrnul.c \
+	stripslash.c \
+	strndup.c \
+	strnlen.c \
+	xalloc-die.c \
+	xmalloc.c \
+	alloca.h \
+	getopt.h
+
+CLEANFILES+= alloca.h getopt.h
+
+getopt.h: getopt_.h
+	ln -fs ${.ALLSRC} ${.TARGET}
 
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../../contrib/cpio 
-CFLAGS+= -DRETSIGTYPE=void -DHAVE_SYS_MTIO_H=1 -DSTDC_HEADERS=1 \
-	 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UTIME_H=1 \
-	 -DHAVE_STRERROR=1 -DHAVE_VPRINTF=1 -DDIRENT=1 -DHAVE_LCHOWN \
-	 -DHAVE_SYS_PARAM_H=1
+alloca.h: alloca_.h
+	ln -fs ${.ALLSRC} ${.TARGET}
 
-SRCS =  copyin.c copyout.c copypass.c defer.c dirname.c dstring.c error.c \
-	filemode.c global.c idcache.c main.c makepath.c \
-	rtapelib.c stripslash.c tar.c userspec.c util.c version.c \
-	xmalloc.c xstrdup.c
+CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \
+	-DHAVE_MKFIFO -DHAVE_SETLOCALE -DHAVE_LSTAT
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cpio/doc/Makefile b/gnu/usr.bin/cpio/doc/Makefile
index 5ccf5da50a85..220de5fdf823 100644
--- a/gnu/usr.bin/cpio/doc/Makefile
+++ b/gnu/usr.bin/cpio/doc/Makefile
@@ -3,13 +3,13 @@
 
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../../contrib/cpio
+.PATH:	${.CURDIR}/../../../../contrib/cpio/doc
 
 INFO = cpio
 
 INFOSECTION= "Cpio Documentation"
 INFOENTRY_cpio="* CPIO: (cpio).                 Making tape (or disk) archives."
 
-SRCDIR= ${.CURDIR}/../../../../contrib/cpio
+SRCDIR= ${.CURDIR}/../../../../contrib/cpio/doc
 
 .include <bsd.info.mk>