diff --git a/data/Makefile b/data/Makefile
index 78397e9494..778dc0c475 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,73 +1,76 @@
-# $Id: Makefile,v 1.27 1998-04-16 10:39:00 wosch Exp $
+# $Id: Makefile,v 1.28 1998-04-16 12:51:43 wosch Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 ACCESS_LOG_DIR?=/home/www/server/logs
 ACCESS_LOG_FILE?=access_log
 ANALOG?=/home/www/bin/analog
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= cgallery.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml mozilla.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 DOCS+= y2kbug.sgml search-mid.sgml press.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 
 # Files or targets listed here are defined in this file.
 
 #LOCAL=	stats.html stats-img.html
 
 stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl atoz.pl > ${.TARGET}
 
 cgallery.html: cgallery.sgml cgallery.inc
 cgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl commercial gallery.db > cgallery.inc
 
 npgallery.html: npgallery.sgml npgallery.inc
 npgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl nonprofit gallery.db > npgallery.inc
 
 pgallery.html: pgallery.sgml pgallery.inc
 pgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl personal gallery.db > pgallery.inc
 
 # Subdirectories
 
-SUBDIR=		cgi commercial docproj gifs ports releases tutorials ja_JP.EUC
+SUBDIR=		cgi commercial docproj gifs ports releases tutorials 
+.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
+SUBDIR+=	ja_JP.EUC
+.endif
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
 .include "web.mk"
 
diff --git a/en/Makefile b/en/Makefile
index 78397e9494..778dc0c475 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,73 +1,76 @@
-# $Id: Makefile,v 1.27 1998-04-16 10:39:00 wosch Exp $
+# $Id: Makefile,v 1.28 1998-04-16 12:51:43 wosch Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 ACCESS_LOG_DIR?=/home/www/server/logs
 ACCESS_LOG_FILE?=access_log
 ANALOG?=/home/www/bin/analog
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= cgallery.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml mozilla.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 DOCS+= y2kbug.sgml search-mid.sgml press.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 
 # Files or targets listed here are defined in this file.
 
 #LOCAL=	stats.html stats-img.html
 
 stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl atoz.pl > ${.TARGET}
 
 cgallery.html: cgallery.sgml cgallery.inc
 cgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl commercial gallery.db > cgallery.inc
 
 npgallery.html: npgallery.sgml npgallery.inc
 npgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl nonprofit gallery.db > npgallery.inc
 
 pgallery.html: pgallery.sgml pgallery.inc
 pgallery.inc: gallery.db gengallery.pl
 	./gengallery.pl personal gallery.db > pgallery.inc
 
 # Subdirectories
 
-SUBDIR=		cgi commercial docproj gifs ports releases tutorials ja_JP.EUC
+SUBDIR=		cgi commercial docproj gifs ports releases tutorials 
+.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
+SUBDIR+=	ja_JP.EUC
+.endif
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
 .include "web.mk"