From owner-svn-doc-all@FreeBSD.ORG  Mon Jun 24 08:23:30 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D976F7DB;
 Mon, 24 Jun 2013 08:23:30 +0000 (UTC)
 (envelope-from blackend@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CAD9C1649;
 Mon, 24 Jun 2013 08:23:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O8NUB6094142;
 Mon, 24 Jun 2013 08:23:30 GMT
 (envelope-from blackend@svn.freebsd.org)
Received: (from blackend@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O8NUuY094141;
 Mon, 24 Jun 2013 08:23:30 GMT
 (envelope-from blackend@svn.freebsd.org)
Message-Id: <201306240823.r5O8NUuY094141@svn.freebsd.org>
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Mon, 24 Jun 2013 08:23:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42023 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 08:23:30 -0000

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