summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-02-07 09:27:07 +0000
committerdim <dim@FreeBSD.org>2012-02-07 09:27:07 +0000
commit489adb600f55e6d6efe8f0a5a33c070a9c8335a6 (patch)
treef4288bb4a19e87202aaf6ef984ab4952750e882b /lib
parente2807c4b0cf1ff9134ebf7ec353acccf55a3ac51 (diff)
downloadFreeBSD-src-489adb600f55e6d6efe8f0a5a33c070a9c8335a6.zip
FreeBSD-src-489adb600f55e6d6efe8f0a5a33c070a9c8335a6.tar.gz
Consistently set RPCGEN_CPP when running rpcgen, so the C preprocessor
set via ${CPP} is used, instead of always using hardcoded /usr/bin/cpp. MFC after: 1 week
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/rpc/Makefile.inc2
-rw-r--r--lib/libc/yp/Makefile.inc2
-rw-r--r--lib/librpcsvc/Makefile2
-rw-r--r--lib/libypclnt/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index db0b8ad..32e8f86 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -34,7 +34,7 @@ CFLAGS+= -I${.CURDIR}/rpc
CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
RPCDIR= ${DESTDIR}/usr/include/rpcsvc
-RPCGEN= rpcgen -C
+RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h
${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index 842e63e..6faa9a5 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -10,7 +10,7 @@ CLEANFILES+= yp.h yp_xdr.c
SYM_MAPS+= ${.CURDIR}/yp/Symbol.map
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
-RPCGEN= rpcgen -C
+RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
yp_xdr.c: ${RPCSRC}
${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 8bb7458..9c9e3ae 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -18,7 +18,7 @@ SECRPCSRCS= secretkey.c xcrypt.c
OTHERSRCS+= yp_passwd.c yp_update.c
.endif
-RPCCOM = rpcgen -C
+RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C
INCDIRS= -I${DESTDIR}/usr/include/rpcsvc
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 5a3ecb4..2e302f1 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -22,7 +22,7 @@ GENSRCS=yp.h \
yppasswd_private_clnt.c \
yppasswd_private_xdr.c
-RPCGEN= rpcgen -C
+RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x
RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x
RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
OpenPOWER on IntegriCloud