os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

big refactoring

Browse source 
- `make install` should not depend on `make all'
- the local all-install target does not make any sense here.
  We should not install the target twice in different locations.
- the FORMATS value should be configurable and not hard coded
- fix update of pgpkeyring.txt

PR: 222828
This commit is contained in:
Wolfram Schneider 2017-10-07 10:12:16 +00:00
parent 3fed2208d4
commit 583fe8e8de
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=51076
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
en_US.ISO8859-1/htdocs/doc/Makefile
View file

@ -12,41 +12,28 @@
.include "../Makefile.inc"
.endif
all: all-all all-install all-pgpkeyring
_DOC_FORMATS?= html-split html
all: all-all all-pgpkeyring
all-all:
@unset DESTDIR || true; \
cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" \
INSTALL_COMPRESSED= all
all-install:
@unset DESTDIR || true; \
cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
INSTALL_COMPRESSED= install
all-pgpkeyring:
@unset DESTDIR || true; \
cd ${DOC_PREFIX}/share/pgpkeys; \
${MAKE} \
pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
install clean:
@unset DESTDIR || true; \
cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
INSTALL_COMPRESSED= ${.TARGET}
.if make(install)
@unset DESTDIR || true; \
cd ${DOC_PREFIX}/share/pgpkeys; \
${MAKE} \
pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
.endif
.if make(clean)
${RM} -rf en* handbook faq pgpkeyring.txt
.endif
all-pgpkeyring:
${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
clean:
${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
# here are dragons
install:
unset DESTDIR || true; \
${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install
${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt
.include "${DOC_PREFIX}/share/mk/web.site.mk"
# XXX
obj: _OBJUSE
_OBJUSE: .USE