Author: emaste
Date: Thu Jul 25 17:10:17 2019
New Revision: 350327
URL: https://svnweb.freebsd.org/changeset/base/350327

Log:
  libsysdecode: use the proper include directory
  
  Reported by:  cy
  Reviewed by:  lwhsu
  Sponsored by: The FreeBSD Foundation
  Differential Revision:        https://reviews.freebsd.org/D21068

Modified:
  head/Makefile.libcompat
  head/lib/libsysdecode/Makefile

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat     Thu Jul 25 16:22:37 2019        (r350326)
+++ head/Makefile.libcompat     Thu Jul 25 17:10:17 2019        (r350327)
@@ -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 \

Modified: head/lib/libsysdecode/Makefile
==============================================================================
--- head/lib/libsysdecode/Makefile      Thu Jul 25 16:22:37 2019        
(r350326)
+++ head/lib/libsysdecode/Makefile      Thu Jul 25 17:10:17 2019        
(r350327)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to