Date: Sat, 11 Nov 2000 04:43:55 +0200 From: Neil Blakey-Milner <nbm@mithrandr.moria.org> To: FreeBSD Documentation Project <doc@FreeBSD.org> Subject: Patchset for www to remove links, and make build obj-clean. Message-ID: <20001111044355.A57981@mithrandr.moria.org>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
This patch-set removes the use of symlinks in the web build by using
relative directories for languages instead of symlinks to relative
directories and updating the Spanish build to use the WEB_PREFIX and
web.site.mk.
Also lost in there are one or two changes necessary to build the Spanish
build in a separate object tree, which the others seem to support, or
don't have the functionality that would need the changes.
This survives a full web site build, in both obj and non-obj cases (that
really takes a long time on a p166), and is quite simple. A quick
confirmation means I'll commit it soon, or I'll wait until Monday.
This changes one behaviour of www/ - now, "make" by itself with no
target, or with target "all" goes to en/ and builds. Previously it
ran the "links" target. Since the links target is going away, it makes
sense that "make" in /usr/www will build the entire web site. In
future, I'll probably remove the jumping to language directories in
en/Makefile, and add language directories in www/Makefile, to match
expected behaviour, and the doc build.
Neil
--
Neil Blakey-Milner
nbm@mithrandr.moria.org
[-- Attachment #2 --]
Index: Makefile
===================================================================
RCS file: /home/ncvs/www/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 2000/11/08 01:15:39 1.15
+++ Makefile 2000/11/11 02:17:04
@@ -2,13 +2,13 @@
WEB_PREFIX= ${.CURDIR}
-LINKS= en/ja en/es en/ru en/zh
-LINKS+= ja/web.mk es/web.mk ru/web.mk
-LINKS+= web.mk
+#LINKS= en/ja en/es en/ru en/zh
+#LINKS+= ja/web.mk es/web.mk ru/web.mk
+#LINKS+= web.mk
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-LINKS+= ../doc/en_US.ISO_8859-1/web.mk
-LINKS+= ../doc/en_US.ISO_8859-1/includes.sgml
+#LINKS+= ../doc/en_US.ISO_8859-1/web.mk
+#LINKS+= ../doc/en_US.ISO_8859-1/includes.sgml
.endif
SUBDIR= en
@@ -17,7 +17,7 @@
SUBDIR+= ja es ru zh
.endif
-all: links
+#all:# links
links: ${LINKS}
Index: en/Makefile
===================================================================
RCS file: /home/ncvs/www/en/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- en/Makefile 2000/11/07 07:37:55 1.55
+++ en/Makefile 2000/11/11 01:31:38
@@ -60,8 +60,8 @@
.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
.for DIR in ${WEB_LANG}
-#SUBDIR+= ../${DIR}
-SUBDIR+= ${DIR}
+SUBDIR+= ../${DIR}
+#SUBDIR+= ${DIR}
.endfor
.endif
Index: es/Makefile
===================================================================
RCS file: /home/ncvs/www/es/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- es/Makefile 2000/02/28 12:43:08 1.8
+++ es/Makefile 2000/11/11 01:35:26
@@ -3,6 +3,9 @@
.if exists(Makefile.conf)
.include "Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
# These are turned into validated, normalized HTML files.
@@ -68,5 +71,5 @@
WEBDIR= data/es
-.include "web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/Makefile.inc
===================================================================
RCS file: /home/ncvs/www/es/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- es/Makefile.inc 1999/09/06 07:02:59 1.2
+++ es/Makefile.inc 2000/11/11 01:36:47
@@ -1,3 +1,4 @@
# $FreeBSD: www/es/Makefile.inc,v 1.2 1999/09/06 07:02:59 peter Exp $
WEBBASE?= /data/es
+WEB_PREFIX?= ${.CURDIR}/../..
Index: es/alpha/Makefile
===================================================================
RCS file: /home/ncvs/www/es/alpha/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/alpha/Makefile 1999/09/06 07:03:01 1.2
+++ es/alpha/Makefile 2000/11/11 01:56:54
@@ -3,9 +3,12 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS= alpha.sgml
INDEXLINK=alpha.html
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/copyright/Makefile
===================================================================
RCS file: /home/ncvs/www/es/copyright/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/copyright/Makefile 1999/09/06 07:03:01 1.2
+++ es/copyright/Makefile 2000/11/11 01:57:36
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS= license.sgml
DOCS+= freebsd-license.sgml
@@ -19,4 +22,4 @@
#${LEGAL}: $${CVSROOT}/ports/LEGAL,v
# co -q -p ${.ALLSRC} > ${.TARGET}
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/docproj/Makefile
===================================================================
RCS file: /home/ncvs/www/es/docproj/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/docproj/Makefile 1999/09/06 07:03:01 1.2
+++ es/docproj/Makefile 2000/11/11 01:41:06
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS= current.sgml
DOCS+= doc-set.sgml
@@ -14,4 +17,4 @@
INDEXLINK= docproj.html
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/internal/Makefile
===================================================================
RCS file: /home/ncvs/www/es/internal/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- es/internal/Makefile 1999/09/06 07:03:02 1.7
+++ es/internal/Makefile 2000/11/11 01:57:16
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS= photos.sgml
DOCS+= internal.sgml
@@ -16,4 +19,4 @@
DATA+= README.mirror
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/news/Makefile
===================================================================
RCS file: /home/ncvs/www/es/news/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- es/news/Makefile 1999/09/06 07:03:03 1.5
+++ es/news/Makefile 2000/11/11 01:56:31
@@ -3,9 +3,8 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
-
-.if exists("../Makefile.conf")
-.include "../Makefile.conf"
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
.endif
# quick news letter
@@ -33,4 +32,4 @@
INDEXLINK= news.html
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/ports/Makefile
===================================================================
RCS file: /home/ncvs/www/es/ports/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- es/ports/Makefile 1999/11/15 20:37:56 1.7
+++ es/ports/Makefile 2000/11/11 03:09:03
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
.if exists(Makefile.inc)
.include "Makefile.inc"
.endif
@@ -47,11 +50,11 @@
index.sgml: ${INDEX} ${Y2K} packages.exists portindex ports.inc .NOTMAIN
rm -f *.sgml
- ${PORTINDEX} ${INDEX} ${Y2K}
+ ${PORTINDEX} ${INDEX} ${Y2K} ${.CURDIR}
install: all
all install clean:
- ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET}
+ (cd ${.CURDIR} &&${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET})
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/ports/Makefile.inc0
===================================================================
RCS file: /home/ncvs/www/es/ports/Makefile.inc0,v
retrieving revision 1.1
diff -u -r1.1 Makefile.inc0
--- es/ports/Makefile.inc0 1999/11/15 20:37:56 1.1
+++ es/ports/Makefile.inc0 2000/11/11 03:08:28
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
.if exists(Makefile.inc)
.include "Makefile.inc"
@@ -13,4 +16,4 @@
.endif
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/ports/portindex
===================================================================
RCS file: /home/ncvs/www/es/ports/portindex,v
retrieving revision 1.4
diff -u -r1.4 portindex
--- es/ports/portindex 1999/07/01 21:01:03 1.4
+++ es/ports/portindex 2000/11/11 03:06:43
@@ -40,7 +40,7 @@
$today = &getdate;
&packages_exist('packages.exists', *packages);
-&category_description('categories', *category_description);
+&category_description(($ARGV[2] || '.') . '/categories', *category_description);
&y2k_statements;
&main;
Index: es/projects/Makefile
===================================================================
RCS file: /home/ncvs/www/es/projects/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/projects/Makefile 1999/09/06 07:03:05 1.2
+++ es/projects/Makefile 2000/11/11 01:55:42
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS= projects.sgml
DOCS+= mozilla.sgml
@@ -10,4 +13,4 @@
INDEXLINK= projects.html
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- es/releases/Makefile 1999/12/30 13:44:01 1.6
+++ es/releases/Makefile 2000/11/11 02:04:26
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS?= index.sgml snapshots.sgml
@@ -14,4 +17,4 @@
SUBDIR=
.endif
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/Makefile.inc
===================================================================
RCS file: /home/ncvs/www/es/releases/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- es/releases/Makefile.inc 1999/09/06 07:03:05 1.2
+++ es/releases/Makefile.inc 2000/11/11 01:57:58
@@ -1,4 +1,4 @@
# $FreeBSD: www/es/releases/Makefile.inc,v 1.2 1999/09/06 07:03:05 peter Exp $
WEBBASE?= /data/es/releases
-
+WEB_PREFIX?= ${.CURDIR}/../../..
Index: es/releases/1.1/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/1.1/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/1.1/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/1.1/Makefile 2000/11/11 01:59:13
@@ -1,4 +1,5 @@
DATA= CONTRIB.386BSD CONTRIB.FreeBSD COPYRIGHT.386BSD COPYRIGHT.FreeBSD
DATA+= MIRROR.SITES PERSONAL.ACKS RELNOTES.FreeBSD SUPPORT.TXT
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/1.1.5/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/1.1.5/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/1.1.5/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/1.1.5/Makefile 2000/11/11 02:03:27
@@ -3,4 +3,5 @@
DATA+= PERSONAL.ACKS REGISTER.FreeBSD RELNOTES.FreeBSD ROSTER.FreeBSD
DATA+= SUPPORT.TXT TODO-1.1.5
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.0/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.0/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.0/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.0/Makefile 2000/11/11 02:04:39
@@ -1,4 +1,5 @@
DOCS= announce.sgml credits.sgml install.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.0.5R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.0.5R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.0.5R/Makefile 1999/02/08 19:26:11 1.1.1.1
+++ es/releases/2.0.5R/Makefile 2000/11/11 02:04:39
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.1.5R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.1.5R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.1.5R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.1.5R/Makefile 2000/11/11 02:04:39
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.1.6R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.1.6R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.1.6R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.1.6R/Makefile 2000/11/11 02:04:39
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml security.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.1.7R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.1.7R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.1.7R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.1.7R/Makefile 2000/11/11 02:04:39
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.1R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.1R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.1R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.1R/Makefile 2000/11/11 02:04:39
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.1R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.1R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.1R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.2.1R/Makefile 2000/11/11 02:04:40
@@ -1,3 +1,4 @@
DOCS= notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.2R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.2R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.2R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.2.2R/Makefile 2000/11/11 02:04:40
@@ -1,3 +1,4 @@
DOCS= notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.5R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.5R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.5R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.2.5R/Makefile 2000/11/11 02:04:40
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.6R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.6R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.6R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/2.2.6R/Makefile 2000/11/11 02:04:40
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.7R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.7R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.7R/Makefile 1999/02/08 19:26:11 1.1.1.1
+++ es/releases/2.2.7R/Makefile 2000/11/11 02:04:41
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2.8R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2.8R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2.8R/Makefile 1999/02/08 19:26:11 1.1.1.1
+++ es/releases/2.2.8R/Makefile 2000/11/11 02:04:41
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/2.2R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/2.2R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/2.2R/Makefile 1999/02/08 19:26:11 1.1.1.1
+++ es/releases/2.2R/Makefile 2000/11/11 02:04:41
@@ -1,3 +1,4 @@
DOCS= announce.sgml install-media.sgml notes.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/3.0R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/3.0R/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- es/releases/3.0R/Makefile 1999/02/08 19:26:12 1.1.1.1
+++ es/releases/3.0R/Makefile 2000/11/11 02:03:58
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/3.1R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/3.1R/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- es/releases/3.1R/Makefile 1999/02/16 14:29:30 1.1
+++ es/releases/3.1R/Makefile 2000/11/11 02:03:58
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/3.2R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/3.2R/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- es/releases/3.2R/Makefile 1999/05/19 13:40:24 1.1
+++ es/releases/3.2R/Makefile 2000/11/11 02:03:58
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/3.3R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/3.3R/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- es/releases/3.3R/Makefile 1999/09/27 21:22:52 1.1
+++ es/releases/3.3R/Makefile 2000/11/11 02:03:58
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/releases/3.4R/Makefile
===================================================================
RCS file: /home/ncvs/www/es/releases/3.4R/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- es/releases/3.4R/Makefile 1999/12/30 13:49:12 1.1
+++ es/releases/3.4R/Makefile 2000/11/11 02:03:58
@@ -1,3 +1,4 @@
DOCS= announce.sgml notes.sgml errata.sgml
-.include "../../web.mk"
+.include "../Makefile.inc"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/search/Makefile
===================================================================
RCS file: /home/ncvs/www/es/search/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/search/Makefile 1999/09/06 07:03:13 1.2
+++ es/search/Makefile 2000/11/11 03:03:47
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS+= index-site.sgml
DOCS+= search.sgml
@@ -13,12 +16,12 @@
CLEANFILES+=atoz.sgml site.sgml
-index-site.sgml: atoz.sgml site.sgml
+index-site.html: atoz.sgml site.sgml
atoz.sgml: web.atoz
- sort -fu web.atoz | perl atoz.pl > ${.TARGET}
+ sort -fu ${.CURDIR}/web.atoz | perl ${.CURDIR}/atoz.pl > ${.TARGET}
site.sgml: site.map
- ./site.pl < ${.ALLSRC} > ${.TARGET}
+ ${.CURDIR}/site.pl < ${.ALLSRC} > ${.TARGET}
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: es/security/Makefile
===================================================================
RCS file: /home/ncvs/www/es/security/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/security/Makefile 1999/09/06 07:03:14 1.2
+++ es/security/Makefile 2000/11/11 01:37:05
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS=
DOCS+= programmers.sgml
@@ -11,4 +14,4 @@
INDEXLINK= security.html
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001111044355.A57981>