aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/bsdcat
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/bsdcat')
-rw-r--r--usr.bin/bsdcat/Makefile2
-rw-r--r--usr.bin/bsdcat/tests/Makefile10
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index f3dd81221b60..c5e8c024a233 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcat
-BSDCAT_VERSION_STRING= 3.2.2
+BSDCAT_VERSION_STRING= 3.3.1
.PATH: ${_LIBARCHIVEDIR}/cat
SRCS= bsdcat.c cmdline.c
diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile
index d8e8ac80b7c8..a23650572f3a 100644
--- a/usr.bin/bsdcat/tests/Makefile
+++ b/usr.bin/bsdcat/tests/Makefile
@@ -14,8 +14,8 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR}
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
-CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils
+CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/cat/test
+CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils
# Uncomment to link against dmalloc
#LDADD+= -L/usr/local/lib -ldmalloc
@@ -40,11 +40,11 @@ TESTS_SRCS= \
test_version.c
SRCS.bsdcat_test= list.h \
- ${TESTS_SRCS} \
- main.c
+ ${TESTS_SRCS}
.PATH: ${_LIBARCHIVEDIR}/test_utils
-SRCS.bsdcat_test+= test_utils.c
+SRCS.bsdcat_test+= test_main.c \
+ test_utils.c
LIBADD.bsdcat_test= archive