From c8f43ef65df0beac8b700cbc5388f71daba75719 Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Mon, 8 Feb 1999 19:34:03 +0000
Subject: [PATCH] Resolve conflicts.

---
 es/Makefile | 70 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/es/Makefile b/es/Makefile
index 454a4cbfa6..fe39d3c3e7 100644
--- a/es/Makefile
+++ b/es/Makefile
@@ -1,10 +1,70 @@
-# $Id: Makefile,v 1.3 1998-08-11 17:40:51 wosch Exp $
+# $Id: Makefile,v 1.4 1999-02-08 19:34:03 wosch Exp $
 
+.if exists(Makefile.conf)
+.include "Makefile.conf"
+.endif
+
+
+# These are turned into validated, normalized HTML files.
+
+DOCS=  applications.sgml
+DOCS+= auditors.sgml
+DOCS+= availability.sgml
+DOCS+= docs.sgml 
+DOCS+= features.sgml
+DOCS+= register.sgml
+DOCS+= index.sgml
+DOCS+= internet.sgml 
+DOCS+= mailto.sgml 
+DOCS+= publish.sgml
+DOCS+= send-pr.sgml
+DOCS+= support.sgml
+DOCS+= where.sgml 
+DOCS+= y2kbug.sgml 
+
+CLEANFILES+=atoz.sgml site.sgml
+
+# These will be directly installed.
+
+#DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
+DATA=	robots.txt index.html
+
+# Subdirectories
+# SGML
+SUBDIR=	 security
+#SUBDIR+= commercial
+SUBDIR+= docproj
+SUBDIR+= news
+SUBDIR+= alpha
+SUBDIR+= internal
+SUBDIR+= copyright
+SUBDIR+= search
+#SUBDIR+= gallery
+SUBDIR+= ports
+SUBDIR+= projects
+SUBDIR+= releases 
+#SUBDIR+= doc-es
+
+# Non-SGML
+#SUBDIR+= gifs
+#SUBDIR+= cgi
+
+# Non-English
+#.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
+#SUBDIR+= ja
+#SUBDIR+= es
+#.endif
+
+.if !defined(WEB_ONLY) || empty(WEB_ONLY)
+# Extern
+#SUBDIR+= tutorials
+
+#DOCSUBDIR=	FAQ handbook
 DOCSUBDIR=	FAQ
-SGMLOPTS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr 
+.endif
+SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
+WEBDIR=		data/es
 
-WEBBASE=	/data
-
-.include "../web.mk"
+.include "web.mk"