diff options
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 1 | ||||
-rw-r--r-- | gnu/usr.bin/groff/Makefile.inc | 1 | ||||
-rwxr-xr-x | include/mk-osreldate.sh | 2 | ||||
-rw-r--r-- | kerberos5/Makefile.inc | 2 | ||||
-rw-r--r-- | kerberos5/lib/libheimipcc/Makefile | 3 | ||||
-rw-r--r-- | lib/msun/Makefile | 2 | ||||
-rw-r--r-- | tests/sys/pjdfstest/pjdfstest/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/kdump/mkioctls | 2 |
8 files changed, 10 insertions, 5 deletions
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 8f75f43..31f6a85 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -217,6 +217,7 @@ tconfig.h: GENSRCS+= tconfig.h CLEANFILES+= cs-tconfig.h + # Options optionlist: ${OPT_FILES} LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET} diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index 053f385..67b61a8 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -127,6 +127,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` .sh .pl: @${ECHO} Making ${.TARGET} from ${.IMPSRC} + @rm -f ${.TARGET} @sed -e "s|@BINDIR@|${BINDIR}|g" \ -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \ -e "s;@FONTDIR@;$(fontdir);g" \ diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh index 239a661..ed8311c 100755 --- a/include/mk-osreldate.sh +++ b/include/mk-osreldate.sh @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index c59c332..5667599 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -35,7 +35,7 @@ ETSRCS= \ .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" -.ORDER: ${_ET}.c ${_ET}.h +.ORDER: ${_ET}.h ${_ET}.c ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile index eaab2d2..2dca400 100644 --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -11,7 +11,8 @@ SRCS= \ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ - -I${KRB5DIR}/lib/ipc + -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/include .include <bsd.lib.mk> diff --git a/lib/msun/Makefile b/lib/msun/Makefile index f34255f..f22f5dc 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -35,6 +35,8 @@ CFLAGS+= -I${.CURDIR}/ld80 CFLAGS+= -I${.CURDIR}/ld128 .endif +CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} + .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/src .PATH: ${.CURDIR}/man diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile index c0e82a4..29bee82 100644 --- a/tests/sys/pjdfstest/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/pjdfstest/Makefile @@ -8,7 +8,7 @@ BINDIR= ${TESTSBASE}/sys/pjdfstest PROG= pjdfstest MAN= -CFLAGS= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS +CFLAGS+= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT CFLAGS+= -DHAS_CONNECTAT diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index a9ba860..f9dff50 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -39,7 +39,7 @@ case "${MACHINE}" in esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */" |