svn commit: r51076 - head/en_US.ISO8859-1/htdocs/doc

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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"