aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-07-25 17:10:17 +0000
committerEd Maste <emaste@FreeBSD.org>2019-07-25 17:10:17 +0000
commit78aee653e975ae2f8cb01aef0c4e748b35a7a7d4 (patch)
tree9cd46e0b923c7c81a167bcd9099ec10787df6d55
parent1f0a85545ee66c74aed3f380f05396dea2340712 (diff)
Notes
-rw-r--r--Makefile.libcompat1
-rw-r--r--lib/libsysdecode/Makefile7
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 21f7300ef70c..f2da3bd06587 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -186,7 +186,6 @@ build${libcompat}: .PHONY
.endif
mkdir -p ${WORLDTMP}
ln -sf ${.CURDIR}/sys ${WORLDTMP}
- ln -sf ${.CURDIR}/sys ${LIBCOMPATTMP}
.for _t in ${_obj} includes
.for _dir in ${_LC_INCDIRS}
${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \
diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile
index caab36d1e303..2be244a6da46 100644
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@@ -123,9 +123,10 @@ CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls
CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}}
DEPENDOBJS+= tables.h
-tables.h: mktables ${SYSROOT}/sys/netinet/in.h ${SYSROOT}/sys/netinet/tcp.h \
- ${SYSROOT}/sys/netinet6/in6.h
- sh ${.CURDIR}/mktables ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} ${.TARGET}.tmp && \
+incdir=${SYSROOT:U${DESTDIR}}${INCLUDEDIR}
+tables.h: mktables ${incdir}/netinet/in.h ${incdir}/netinet/tcp.h \
+ ${incdir}/netinet6/in6.h
+ sh ${.CURDIR}/mktables ${incdir} ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}
# mkioctls runs find(1) for headers so needs to rebuild every time. This used