diff --git a/data/Makefile b/data/Makefile
index e20ec35815..1ad5acd0a1 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,48 +1,58 @@
-# $Id: Makefile,v 1.14 1997-04-23 19:52:40 jfieber Exp $
+# $Id: Makefile,v 1.15 1997-04-24 23:03:54 jmg 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 index.sgml
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml search.sgml searchhints.sgml send-pr.sgml
 DOCS+= security.sgml support.sgml welcome.sgml where.sgml resignation.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt
 
 # Files or targets listed here are defined in this file.
 
 LOCAL=	stats.html stats-img.html
 
-stats.html: /home/www/server/logs/access_log
+stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
-	(cd /home/www/server/logs;zcat access_log.*.gz;cat access_log) | \
+	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
+	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
-	/home/www/bin/analog +i0 +R500 -o > ${.TARGET}
+	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
-stats-img.html: /home/www/server/logs/access_log
+stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
-	(cd /home/www/server/logs;zcat access_log.*.gz;cat access_log) | \
-	/home/www/bin/analog +i0 +R500 -o > ${.TARGET}
+	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
+	    cat ${ACCESS_LOG_FILE}) | \
+	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 # Subdirectories
 
 SUBDIR=		cgi commercial gifs ports releases tutorials ja_JP.EUC
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 
 # Directories that need to be checked out from the 
 # CVS repository.
 
 CVSDIR=		FAQ handbook
 
 WEBDIR=		data
 
 .include "web.mk"
 
diff --git a/en/Makefile b/en/Makefile
index e20ec35815..1ad5acd0a1 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,48 +1,58 @@
-# $Id: Makefile,v 1.14 1997-04-23 19:52:40 jfieber Exp $
+# $Id: Makefile,v 1.15 1997-04-24 23:03:54 jmg 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 index.sgml
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml search.sgml searchhints.sgml send-pr.sgml
 DOCS+= security.sgml support.sgml welcome.sgml where.sgml resignation.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt
 
 # Files or targets listed here are defined in this file.
 
 LOCAL=	stats.html stats-img.html
 
-stats.html: /home/www/server/logs/access_log
+stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
-	(cd /home/www/server/logs;zcat access_log.*.gz;cat access_log) | \
+	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
+	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
-	/home/www/bin/analog +i0 +R500 -o > ${.TARGET}
+	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
-stats-img.html: /home/www/server/logs/access_log
+stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
-	(cd /home/www/server/logs;zcat access_log.*.gz;cat access_log) | \
-	/home/www/bin/analog +i0 +R500 -o > ${.TARGET}
+	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
+	    cat ${ACCESS_LOG_FILE}) | \
+	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 # Subdirectories
 
 SUBDIR=		cgi commercial gifs ports releases tutorials ja_JP.EUC
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 
 # Directories that need to be checked out from the 
 # CVS repository.
 
 CVSDIR=		FAQ handbook
 
 WEBDIR=		data
 
 .include "web.mk"