Merge the following from the English version:

1.147 -> 1.148	www/ja/Makefile
	1.8 -> 1.9	www/ja/doc/Makefile
	1.11 -> 1.13	www/ja/platforms/ia64.sgml
This commit is contained in:
Ryusuke SUZUKI 2011-12-11 16:22:34 +00:00
parent d27b0b381c
commit ae3c11f15c
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=38038
3 changed files with 19 additions and 11 deletions

View file

@ -1,6 +1,6 @@
# $FreeBSD: www/ja/Makefile,v 1.81 2011/06/17 12:52:33 ryusuke Exp $ # $FreeBSD: www/ja/Makefile,v 1.82 2011/07/03 00:40:44 ryusuke Exp $
# The FreeBSD Japanese Documentation Project # The FreeBSD Japanese Documentation Project
# Original revision: 1.147 # Original revision: 1.148
.if exists(../Makefile.conf) .if exists(../Makefile.conf)
.include "../Makefile.conf" .include "../Makefile.conf"
@ -21,6 +21,7 @@ DOCS+= features.sgml
DOCS+= internet.sgml DOCS+= internet.sgml
#DOCS+= logo.sgml #DOCS+= logo.sgml
DOCS+= mailto.sgml DOCS+= mailto.sgml
#DOCS+= privacy.sgml
DOCS+= publish.sgml DOCS+= publish.sgml
DOCS+= relnotes.sgml DOCS+= relnotes.sgml
DOCS+= send-pr.sgml DOCS+= send-pr.sgml

View file

@ -1,6 +1,6 @@
# #
# $FreeBSD$ # $FreeBSD: www/ja/doc/Makefile,v 1.1 2002/01/01 14:35:53 hrs Exp $
# Original revision: 1.8 # Original revision: 1.9
# #
# Build the FreeBSD documentation *outside* of the www tree, and install it # Build the FreeBSD documentation *outside* of the www tree, and install it
# in to the right place as necessary. # in to the right place as necessary.
@ -10,33 +10,40 @@
# requirements here. # requirements here.
# #
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
all: all-all all-install all: all-all all-install
all-all: all-all:
@unset DESTDIR || true; \ @unset DESTDIR || true; \
cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" \ ${MAKE} FORMATS="html-split html" \
INSTALL_COMPRESSED= NO_JPMAN= all INSTALL_COMPRESSED= NO_JPMAN= all
all-install: all-install:
@unset DESTDIR || true; \ @unset DESTDIR || true; \
cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
INSTALL_COMPRESSED= NO_JPMAN= install INSTALL_COMPRESSED= NO_JPMAN= install
install clean: install clean:
@unset DESTDIR || true; \ @unset DESTDIR || true; \
cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
INSTALL_COMPRESSED= NO_JPMAN= ${.TARGET} INSTALL_COMPRESSED= NO_JPMAN= ${.TARGET}
.if make(clean) .if make(clean)
${RM} -rf ja* ${RM} -rf ja*
.endif .endif
.include "${.CURDIR}/../../share/mk/web.site.mk" .include "${WEB_PREFIX}/share/mk/web.site.mk"
obj: _OBJUSE obj: _OBJUSE
_OBJUSE: .USE _OBJUSE: .USE
@unset DESTDIR || true; \ @unset DESTDIR || true; \
cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} ${.TARGET} ${MAKE} ${.TARGET}

View file

@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA ".."> <!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/ja/platforms/ia64.sgml,v 1.9 2005/10/04 16:21:47 hrs Exp $"> <!ENTITY date "$FreeBSD: www/ja/platforms/ia64.sgml,v 1.10 2006/08/19 21:24:43 hrs Exp $">
<!ENTITY title "FreeBSD/ia64 プロジェクト"> <!ENTITY title "FreeBSD/ia64 プロジェクト">
<!ENTITY email 'freebsd-ia64'> <!ENTITY email 'freebsd-ia64'>
<!ENTITY % navinclude.developers "INCLUDE"> <!ENTITY % navinclude.developers "INCLUDE">
]> ]>
<!-- The FreeBSD Japanese Documentation Project --> <!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.11 --> <!-- Original revision: 1.13 -->
<html> <html>
&header; &header;