Date: Mon, 24 Jun 2013 08:23:30 +0000 (UTC) From: Marc Fonvieille <blackend@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42023 - head/share/mk Message-ID: <201306240823.r5O8NUuY094141@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: blackend Date: Mon Jun 24 08:23:29 2013 New Revision: 42023 URL: http://svnweb.freebsd.org/changeset/doc/42023 Log: Fix install-html-split target: With the current code running "make install" will build the files but will install only 2 files (docbook.css and tramemark.html). Another "make install" is required to get the missing files. This is not the expected behavior. A quick workaround is to run "make && make install", but let's fix the code to get a working "make install". Discussed with: gabor Modified: head/share/mk/doc.docbook.mk Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Mon Jun 24 07:49:03 2013 (r42022) +++ head/share/mk/doc.docbook.mk Mon Jun 24 08:23:29 2013 (r42023) @@ -705,11 +705,7 @@ install-${_curformat}: ${DOC}.${_curform .endif @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR} .if ${_cf} == "html-split" -.for f in ${_html_docs} -.if exists(${f}) - ${INSTALL_DOCS} ${f} ${DESTDIR} -.endif -.endfor + ${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR} .else ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306240823.r5O8NUuY094141>