diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2007-11-03 15:13:14 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2007-11-03 15:13:14 +0000 |
commit | 35361b518ec550b4cc2b707d0e14fa30572e6b66 (patch) | |
tree | af44e3b741f012b7537f15f4cbb7dbba2cbb08b3 | |
parent | 3569bef6fb08fde3ba865ea9817bae1fb5634632 (diff) |
fix groff build:
- directories must be built in sequence
- manpages can only be built after the main program is finished building.
-rw-r--r-- | gnu/usr.bin/groff/Makefile.bsd-wrapper | 7 | ||||
-rw-r--r-- | gnu/usr.bin/groff/Makefile.in | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gnu/usr.bin/groff/Makefile.bsd-wrapper b/gnu/usr.bin/groff/Makefile.bsd-wrapper index 51b2cc68b0e..4ac8dbb6e7a 100644 --- a/gnu/usr.bin/groff/Makefile.bsd-wrapper +++ b/gnu/usr.bin/groff/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2002/03/22 15:55:54 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2007/11/03 15:13:13 espie Exp $ # # groff config @@ -57,7 +57,7 @@ config.status: /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \ --mandir=${DATASUBDIR}/man ${CF} -gnu_build: +gnu_build: config.status ${MAKE} ${GNUCFLAGS} ${GNUCXXFLAGS} \ LDFLAGS="${INSTALL_STRIP} ${LDSTATIC}" \ prefix=${PREFIX} \ @@ -65,6 +65,7 @@ gnu_build: fontdir=${FONTDIR} \ indexdir=${INDEXDIR} \ common_words_file=${COMMON_WORDS} + touch $@ install: maninstall ${MAKE} ${GNUCFLAGS} ${GNUCXXFLAGS} LDFLAGS=${LDSTATIC} \ @@ -81,6 +82,8 @@ clean cleandir: -@if [ -e Makefile ]; then ${MAKE} distclean; fi rm -f ${CLEANFILES} +BEFOREMAN= gnu_build + depend: # Nothing here so far... diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in index dd0ef84a973..0b00c2e6945 100644 --- a/gnu/usr.bin/groff/Makefile.in +++ b/gnu/usr.bin/groff/Makefile.in @@ -271,7 +271,9 @@ subdir=troff $(TARGETS): - @$(MAKE) $(MDEFINES) do=$@ $(dodirs) + @for i in $(dodirs); do \ + $(MAKE) $(MDEFINES) do=$@ $$i; \ + done dot: FORCE @$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ |