From fbca680c073826912ad81330b8cbea3f0ce4eba2 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Sat, 30 Sep 2000 00:21:39 +0000
Subject: First (and very minor) changes on the way to make the www build
 obj-clean.

This basically entails putting ${.CURDIR} in front of the occasional
source file, script, or directory.

Also adds '.include <bsd.obj.mk>' to web.mk so 'make obj' works.

Change gencommercial script to take a '-s' flag pointing to the source
directory, and the portindex script to take an optional additional
parameter indicating the source directory.

Add -D ${.CURDIR} to sgmlformat to follow includes properly.
---
 Makefile | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7771ae0ef5..26eefda856 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/Makefile,v 1.12 2000/02/28 12:41:23 phantom Exp $
+# $FreeBSD: www/Makefile,v 1.13 2000/02/28 13:15:53 phantom Exp $
 
 LINKS=	en/ja en/es en/ru en/zh
 LINKS+=	ja/web.mk es/web.mk ru/web.mk
@@ -11,6 +11,10 @@ LINKS+= ../doc/en_US.ISO_8859-1/includes.sgml
 
 SUBDIR= en
 
+.if make(obj)
+SUBDIR+= ja es ru zh
+.endif
+
 all: links
 
 
@@ -21,35 +25,36 @@ clean:
 
 
 en/ja:
-	cd en; ln -sf ../ja
+	cd en; ln -sf ${.CURDIR}/ja
 
 en/es:
-	cd en; ln -sf ../es
+	cd en; ln -sf ${.CURDIR}/es
 
 en/ru:
-	cd en; ln -sf ../ru
+	cd en; ln -sf ${.CURDIR}/ru
 
 en/zh:
-	cd en; ln -sf ../zh
+	cd en; ln -sf ${.CURDIR}/zh
 
 ja/web.mk:
-	cd ja; ln -sf ../en/web.mk
+	cd ja; ln -sf ${.CURDIR}/en/web.mk
 
 es/web.mk:
-	cd es; ln -sf ../en/web.mk
+	cd es; ln -sf ${.CURDIR}/en/web.mk
 
 ru/web.mk:
-	cd ru; ln -sf ../en/web.mk
+	cd ru; ln -sf ${.CURDIR}/en/web.mk
 
 web.mk:
-	cd .;  ln -sf en/web.mk
+	cd .;  ln -sf ${.CURDIR}/en/web.mk
 
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 ../doc/en_US.ISO_8859-1/web.mk:
-	cd ../doc/en_US.ISO_8859-1; ln -sf ../../www/en/web.mk
+	cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/web.mk
 
 ../doc/en_US.ISO_8859-1/includes.sgml:
-	cd ../doc/en_US.ISO_8859-1; ln -sf ../../www/en/includes.sgml
+	cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/includes.sgml
 .endif
 
+.include <bsd.obj.mk>
 .include <bsd.subdir.mk>
-- 
cgit v1.3