From owner-freebsd-doc@FreeBSD.ORG Mon Dec 29 16:50:11 2003 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 012DE16A4CE for ; Mon, 29 Dec 2003 16:50:11 -0800 (PST) Received: from mail.ruhr.de (in-ruhr4.ruhr.de [212.23.134.2]) by mx1.FreeBSD.org (Postfix) with SMTP id 4A4A143D58 for ; Mon, 29 Dec 2003 16:50:06 -0800 (PST) (envelope-from ue@nathan.ruhr.de) Received: (qmail 15901 invoked by uid 10); 30 Dec 2003 00:50:04 -0000 Received: from nathan.internal (localhost.internal [127.0.0.1]) by nathan.internal (8.12.9/8.12.9) with ESMTP id hBU0fKkM078527; Tue, 30 Dec 2003 01:41:20 +0100 (CET) (envelope-from ue@nathan.internal) Received: (from ue@localhost) by nathan.internal (8.12.9/8.12.9/Submit) id hBU0fKkP078503; Tue, 30 Dec 2003 01:41:20 +0100 (CET) Date: Tue, 30 Dec 2003 01:41:19 +0100 From: Udo Erdelhoff To: hrs@freebsd.org Message-ID: <20031230004119.GA19005@nathan.ruhr.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="jRHKVT23PllUwdXP" Content-Disposition: inline User-Agent: Mutt/1.4.1i cc: freebsd-doc@freebsd.org Subject: doc.common.mk 1.3 X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Dec 2003 00:50:11 -0000 --jRHKVT23PllUwdXP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, your changes to doc.common.mk break certian cases of out-of-tree builds of the release notes. The problem is quite simple, you set LANGCODE to ${.CURDIR} if either LANGCODE or WWW_LANGCODE is not defined. If the current path does not contain "doc" or "www", LANGCODE is set to ".", and this breaks all non-english versions. In my opinion, you should only use your initialization if *both* LANGCODE and WWW_LANGCODE are empty. If only one of the two variables is empty, you should initialize the other variable with this value. In other words, something like: diff -u -r1.3 doc.common.mk --- doc.common.mk 26 Nov 2003 01:47:00 -0000 1.3 +++ doc.common.mk 30 Dec 2003 00:40:11 -0000 @@ -23,6 +23,18 @@ DOC_PREFIX_NAME?=3D doc WWW_PREFIX_NAME?=3D www =20 +.if defined(LANGCODE) && !empty(LANGCODE) +.if !defined(WWW_LANGCODE) || empty(WWW_LANGCODE) +WWW_LANGCODE=3D${LANGCODE} +.endif +.endif + +.if defined(WWW_LANGCODE) && !empty(WWW_LANGCODE) +.if !defined(LANGCODE) || empty(LANGCODE) +LANGCODE=3D${WWW_LANGCODE} +.endif +.endif + .if !defined(LANGCODE) || empty(LANGCODE) || !defined(WWW_LANGCODE) || emp= ty(WWW_LANGCODE) # Calculate LANGCODE. LANGCODE:=3D ${.CURDIR} Comments? /s/Udo --=20 Ich bin root, ich darf das. --jRHKVT23PllUwdXP Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iQCVAwUBP/DJr0Poh1XnT6hxAQGE1AQAoQyhPLJrsyXrC1JSDPoSP95EcREuqJvB VVZiRsHxJRVzyT5EjPkdbtq3/eW2xEERstrdEbsJB2717U3Ti3/3EK9CJk8JiLRC hWIkmQRhu50wwBBuRQI182CMi/LNQoebz+A0dbXjxT0EkIKi2ws5r0OF9/PZKDak QbkONxBiRNY= =WmhF -----END PGP SIGNATURE----- --jRHKVT23PllUwdXP--