summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-06-11 21:13:05 +0000
committersjg <sjg@FreeBSD.org>2015-06-11 21:13:05 +0000
commit750b155101cde8e0c2e8f0b23d6f5ba89ba33f13 (patch)
tree7e6e9f9c45d1183aeb68258feec369f9231144d6 /gnu
parent4f920c8c896c380d80d646b3272ec56051d92b8b (diff)
downloadFreeBSD-src-750b155101cde8e0c2e8f0b23d6f5ba89ba33f13.zip
FreeBSD-src-750b155101cde8e0c2e8f0b23d6f5ba89ba33f13.tar.gz
Misc fixes from projects/bmake
Differential Revision: D2748 Reviewed by: brooks imp
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libreadline/readline/Makefile12
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile3
-rw-r--r--gnu/usr.bin/groff/Makefile.inc1
3 files changed, 12 insertions, 4 deletions
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 2afeafc..f0bfe5b 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -16,11 +16,15 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
CFLAGS+= -I${.OBJDIR}/..
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+.NOPATH: ${INSTALLED_HEADERS}
+
+beforebuild: ${INSTALLED_HEADERS}
+CLEANFILES+= ${INSTALLED_HEADERS}
+DPSRCS+= ${INSTALLED_HEADERS}
+
.for _h in ${INSTALLED_HEADERS}
-CLEANFILES+= ${_h}
-DPSRCS+= ${.OBJDIR}/${_h}
-${.OBJDIR}/${_h}: ${SRCDIR}/${_h}
- ${INSTALL} ${.ALLSRC} ${.TARGET}
+${_h}: ${SRCDIR}/${_h}
+ ln -sf ${.ALLSRC} ${.TARGET}
.endfor
LIBADD= ncursesw
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index af731c1..4121f5c 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -215,6 +215,9 @@ tconfig.h:
GENSRCS+= tconfig.h
CLEANFILES+= cs-tconfig.h
+
+.NOPATH: ${GENSRCS} ${CLEANFILES}
+
# 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" \
OpenPOWER on IntegriCloud