From owner-svn-doc-all@freebsd.org  Sat Oct  7 10:12:17 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E774E347D4;
 Sat,  7 Oct 2017 10:12:17 +0000 (UTC)
 (envelope-from wosch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4773F7354D;
 Sat,  7 Oct 2017 10:12:17 +0000 (UTC)
 (envelope-from wosch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97ACGp2006641;
 Sat, 7 Oct 2017 10:12:16 GMT (envelope-from wosch@FreeBSD.org)
Received: (from wosch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97ACGfv006640;
 Sat, 7 Oct 2017 10:12:16 GMT (envelope-from wosch@FreeBSD.org)
Message-Id: <201710071012.v97ACGfv006640@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wosch set sender to
 wosch@FreeBSD.org using -f
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Sat, 7 Oct 2017 10:12:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r51076 - head/en_US.ISO8859-1/htdocs/doc
X-SVN-Group: doc-head
X-SVN-Commit-Author: wosch
X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/doc
X-SVN-Commit-Revision: 51076
X-SVN-Commit-Repository: doc
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Oct 2017 10:12:17 -0000

Author: wosch
Date: Sat Oct  7 10:12:16 2017
New Revision: 51076
URL: https://svnweb.freebsd.org/changeset/doc/51076

Log:
  big refactoring
  
  - `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

Modified:
  head/en_US.ISO8859-1/htdocs/doc/Makefile

Modified: head/en_US.ISO8859-1/htdocs/doc/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/doc/Makefile	Sat Oct  7 09:07:53 2017	(r51075)
+++ head/en_US.ISO8859-1/htdocs/doc/Makefile	Sat Oct  7 10:12:16 2017	(r51076)
@@ -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
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
+
 all-pgpkeyring:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/share/pgpkeys; \
-		${MAKE} \
-			pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
-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
+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