diff options
| author | jmmv <jmmv@FreeBSD.org> | 2014-11-01 11:17:54 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2014-11-01 11:17:54 +0000 |
| commit | 120021745eb3a1c1b24fdc54769f808151deb621 (patch) | |
| tree | 7e1f2a559f61d17aad44cfb95b6fefcaa593c4af /libexec | |
| parent | 595e4e5bc797fd4a63eb344ae9df352db666a94d (diff) | |
| parent | 3b6cf63a5c1f2de80b3b7fdd30eab1717f5c9407 (diff) | |
| download | FreeBSD-src-120021745eb3a1c1b24fdc54769f808151deb621.zip FreeBSD-src-120021745eb3a1c1b24fdc54769f808151deb621.tar.gz | |
MFV: Import atf-0.21.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/atf/atf-check/Makefile | 1 | ||||
| -rw-r--r-- | libexec/atf/atf-sh/Makefile | 6 | ||||
| -rw-r--r-- | libexec/atf/atf-sh/tests/Makefile | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index a36d94d..2a9851e 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -36,6 +36,7 @@ SRCS= atf-check.cpp MAN= atf-check.1 CFLAGS+= -I${ATF} +CFLAGS+= -DATF_SHELL='"/bin/sh"' DPADD+= ${LIBATF_CXX} ${LIBATF_C} LDADD+= ${LDATF_CXX} ${LDATF_C} diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index 90a780c..4e14643 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -33,9 +33,13 @@ ATF= ${.CURDIR:H:H:H}/contrib/atf PROG_CXX= atf-sh SRCS= atf-sh.cpp -MAN= atf-sh.1 atf-sh-api.3 +MAN= atf-sh.1 atf-sh.3 +MLINKS+= atf-sh.3 atf-sh-api.3 # Backwards compatibility. CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' +CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' +CFLAGS+= -DATF_SHELL='"/bin/sh"' CFLAGS+= -I${ATF} DPADD+= ${LIBATF_C} ${LIBATF_CXX} diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile index e71b6b5..3360b97 100644 --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -16,8 +16,7 @@ ATF_TESTS_SH+= tp_test integration_test: Makefile ATF_TESTS_SH_SED_integration_test= \ - -e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \ - -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g' + -e 's,__ATF_SH__,/usr/libexec/atf-sh,g' SCRIPTS+= misc_helpers SCRIPTSDIR_misc_helpers=${TESTSDIR} |
