sync from English Makefile, r51076

PR: 222828

1 files changed, 24 insertions, 41 deletions

diff --git a/fr_FR.ISO8859-1/htdocs/doc/Makefile b/fr_FR.ISO8859-1/htdocs/doc/Makefile
index 870db36a52..96f02c6250 100644
--- a/fr_FR.ISO8859-1/htdocs/doc/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/doc/Makefile
@@ -1,64 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
-
-# The FreeBSD French Documentation Project
-# Original revision: 1.8
 
-.if exists(Makefile.conf)
-.include "Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-# all: all-all all-install all-pgpkeyring
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
+
+all: all-all 
+
 
 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 ${.CURDIR}/../../../doc/fr_FR.ISO8859-1/books/handbook; \
-# 		${MAKE} \
-# 			pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
-# .endif
-.if make(clean)
-#	${RM} -rf fr* handbook faq pgpkeyring.txt
-	${RM} -rf fr*
-.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"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/fr_FR.ISO8859-1; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}