summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-20 18:20:38 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-20 18:20:38 +0000
commit7280991d086908899bbac7a569e35cb9b67b8a03 (patch)
treee8b3b208c56dea83b3d7cf81797e58b2a383b8b7 /gnu
parent153d364641ca8ca49a3dd01007bb5caaa992194a (diff)
downloadFreeBSD-src-7280991d086908899bbac7a569e35cb9b67b8a03.zip
FreeBSD-src-7280991d086908899bbac7a569e35cb9b67b8a03.tar.gz
MFC r288429:
Replace most of the beforeinstall: hack with FILES mechanism.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile66
-rw-r--r--gnu/usr.bin/groff/tmac/fr.ISO8859-1.in (renamed from gnu/usr.bin/groff/tmac/fr.ISO8859-1)0
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local.in (renamed from gnu/usr.bin/groff/tmac/mdoc.local)0
-rw-r--r--gnu/usr.bin/groff/tmac/ru.KOI8-R.in (renamed from gnu/usr.bin/groff/tmac/ru.KOI8-R)0
4 files changed, 40 insertions, 26 deletions
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 195d32f..930fe73 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -15,7 +15,7 @@ MLINKS+= groff_man.7 man.7
MLINKS+= groff_me.7 me.7
MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
-CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+CLEANFILES= ${MAN}
NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \
me.tmac \
@@ -40,45 +40,59 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \
composite.tmac \
eqnrc \
troffrc troffrc-end \
+ koi8-r.tmac hyphen.ru \
hyphen.us hyphenex.us
+# These are all generated into the OBJDIR.
SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac www.tmac
STRIPFILES= e.tmac doc.tmac mdoc.local
MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms \
fr.ISO8859-1 ru.KOI8-R
+# These are in srcdir and must be built special to avoid colliding with
+# CURDIR=OBJDIR.
+SRCFILES= fr.ISO8859-1 mdoc.local ru.KOI8-R
+CLEANFILES+= ${SRCFILES}
-all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+FILESGROUPS= FILES
+FILES= ${NORMALFILES}
+FILESOWN= ${TMACOWN}
+FILESGRP= ${TMACGRP}
+FILESMODE= ${TMACMODE}
+FILESDIR= ${TMACDIR}
+MDOCFILESDIR= ${MDOCDIR}
+# Setup handling for the generated and special file groups
+.for var in SPECIAL STRIP MDOC
+FILESGROUPS+= ${var}FILES
+CLEANFILES+= ${${var}FILES}
+${var}FILESOWN?=${TMACOWN}
+${var}FILESGRP?=${TMACGRP}
+${var}FILESMODE?=${TMACMODE}
+${var}FILESDIR?=${TMACDIR}
+.endfor
+
+beforeinstall:
+.if !exists(${DESTDIR}${TMACDIR}/man.local)
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
+.endif
+
+.include <bsd.prog.mk>
+
+# Do this after ../Makefile.inc gets included so DIST_DIR is defined.
.for f in ${MDOCFILES} ${STRIPFILES}
-$f-s: $f
+# Generate the file from the contrib dir or src dir as needed.
+.if ${SRCFILES:M${f}} != ""
+${f}: ${.CURDIR}/${f}.in
+.else
+${f}: ${DIST_DIR}/${f}
+.endif
sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
.endfor
.for f in ${SPECIALFILES}
-$f-s: $f
+${f}: ${DIST_DIR}/${f}
sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \
-e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \
-e "s;@PNMTOPS_NOSETPAGE@;pnmtops;g" \
${.ALLSRC} > ${.TARGET}
.endfor
-
-beforeinstall:
- (cd ${DIST_DIR} && \
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
- ${NORMALFILES} ${DESTDIR}${TMACDIR})
- (cd ${.CURDIR} && \
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
- koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR})
-.for f in ${STRIPFILES} ${SPECIALFILES}
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
- $f-s ${DESTDIR}${TMACDIR}/$f
-.endfor
-.for f in ${MDOCFILES}
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
- $f-s ${DESTDIR}${MDOCDIR}/$f
-.endfor
-.if !exists(${DESTDIR}${TMACDIR}/man.local)
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
- ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
-.endif
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/fr.ISO8859-1 b/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
index 88dda0d..88dda0d 100644
--- a/gnu/usr.bin/groff/tmac/fr.ISO8859-1
+++ b/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local.in
index 6d3708f..6d3708f 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local.in
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
index 0d3eb0f..0d3eb0f 100644
--- a/gnu/usr.bin/groff/tmac/ru.KOI8-R
+++ b/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
OpenPOWER on IntegriCloud