From owner-cvs-all  Tue Apr 11  8:58:18 2000
Delivered-To: cvs-all@freebsd.org
Received: from mail.af.airnet.ne.jp (mail.af.airnet.ne.jp [210.159.66.49])
	by hub.freebsd.org (Postfix) with ESMTP
	id 268D637B6C0; Tue, 11 Apr 2000 08:58:08 -0700 (PDT)
	(envelope-from imura@cs.titech.ac.jp)
Received: from imura.af.airnet.ne.jp (tok203.airnet.ne.jp [210.159.88.203])
	by mail.af.airnet.ne.jp (8.8.8/3.6W/06/13/98-AF.AIRNET.NE.JP) with ESMTP id AAA29426;
	Wed, 12 Apr 2000 00:58:01 +0900
Posted-Date: Wed, 12 Apr 2000 00:57:32 +0900 (JST)
To: asami@FreeBSD.org
Cc: knu@idaemons.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: ports/chinese Makefile.inc ports/german
 Makefile.inc         ports/japanese Makefile.inc ports/korean
 Makefile.inc         ports/russian Makefile.inc ports/vietnamese
 Makefile.inc
From: "R. Imura" <imura@af.airnet.ne.jp>
In-Reply-To: <vqc4s99ox22.fsf@silvia.hip.berkeley.edu>
References: <86hfd9rzkz.wl@archon.local.idaemons.org>
	<86d7nxrtbj.wl@archon.local.idaemons.org>
	<vqc4s99ox22.fsf@silvia.hip.berkeley.edu>
X-Mailer: Mew version 1.94b20 on Emacs 19.34 / Mule 2.3
 =?iso-2022-jp?B?KBskQkt2RSYyVhsoQik=?=
X-Prom-Mew: Prom-Mew 1.93.4 (procmail reader for Mew)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20000412005730F.imura@cs.titech.ac.jp>
Date: Wed, 12 Apr 2000 00:57:30 +0900
X-Dispatcher: imput version 990401(IM113)
Lines: 52
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

> Index: Mk/bsd.port.mk
> ===================================================================
> RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
> retrieving revision 1.334
> diff -u -r1.334 bsd.port.mk
> --- bsd.port.mk	2000/04/10 12:31:02	1.334
> +++ bsd.port.mk	2000/04/11 08:26:03
> @@ -491,6 +491,10 @@
>  # If they exist, include Makefile.inc, then architecture/operating
>  # system specific Makefiles, then local Makefile.local.
>  
> +.if ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/../Makefile.inc)
> +.include "${.CURDIR}/../Makefile.inc"
> +.endif
> +
>  .if exists(${MASTERDIR}/../Makefile.inc)
>  .include "${MASTERDIR}/../Makefile.inc"
>  .endif

Why not just do like this?

.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif

>  * I think it'd be bad if every slave port were to be forced to include
>  * `${.CURDIR}/../Makefile.inc' for itself before including
>  * `${MASTERDIR}/Makefile', so I'd suggest we prepare some files as
>  * follows:

I don't understand this part.

For example, korean/Wnn:

1. Read korean/Wnn/Makefile
2. Read ${MASTERDIR(= japanese/Wnn)/Makefile
3. Read Mk/bsd.port.pre.mk
4. Read ${.CURDIR(= korean/Wnn)}/../Makefile.inc
5. Return to ${MASTERDIR}/Makefile
6. Read Mk/bsd.port.post.mk

So, I think, including ${.CURDIR}/../Makefile.inc before
including ${MASTERDIR}/Makefile never occurs.

Is this my mis-understanding?
Or, are there any slave ports which include both of
bsd.port.pre.mk(or bsd.port.mk) and ${MASTERDIR}/Makefile
in their Makefiles?

-- R. Imura
// my private mail address has changed.
// imura@cs.titech.ac.jp ====> imura@af.airnet.ne.jp /(-.-)y-~~


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message