IFC a couple of files

SVN-Revision: 119

diff --git a/cpio/Makefile b/cpio/Makefile
index dab40a06dbd70dcebb026272b5c06ca337577b81..cc5c1065f251d12e14532762a52bfd966acd2fc0 100644 (file)
--- a/cpio/Makefile
+++ b/cpio/Makefile
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
 PROG=  bsdcpio
-BSDCPIO_VERSION_STRING=0.9.10a
+BSDCPIO_VERSION_STRING=0.9.11b
 SRCS=  cpio.c cmdline.c err.c matching.c pathmatch.c
 WARNS?=        6
 DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" -O0 -g
+CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 LDADD+=        -larchive -lz -lbz2
+
+.if defined(WITH_BSDCPIO)
 SYMLINKS=bsdcpio ${BINDIR}/cpio
 MLINKS= bsdcpio.1 cpio.1
+.endif
 
 .PHONY: check test
 

diff --git a/cpio/config_freebsd.h b/cpio/config_freebsd.h
index 1776ca170ea91770165b3d052ccb27ff4ab202d7..086b77a5339f4bd09f41ed84b250a7b8dd201e8d 100644 (file)
--- a/cpio/config_freebsd.h
+++ b/cpio/config_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/tar/config_freebsd.h,v 1.1 2007/03/11 10:36:42 kientzle Exp $
+ * $FreeBSD$
  */
 
 /* A default configuration for FreeBSD, used if there is no config.h. */