From owner-cvs-all  Fri May 31  1:54:22 2002
Delivered-To: cvs-all@freebsd.org
Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58])
	by hub.freebsd.org (Postfix) with ESMTP
	id E185837B409; Fri, 31 May 2002 01:53:47 -0700 (PDT)
Received: (from jhay@localhost)
	by zibbi.icomtek.csir.co.za (8.11.6/8.11.6) id g4V8raR07689;
	Fri, 31 May 2002 10:53:36 +0200 (SAT)
	(envelope-from jhay)
From: John Hay <jhay@icomtek.csir.co.za>
Message-Id: <200205310853.g4V8raR07689@zibbi.icomtek.csir.co.za>
Subject: Re: cvs commit: src/usr.sbin/named Makefile
In-Reply-To: <200205292149.g4TLnbm04141@freefall.freebsd.org> from "Chris D. Faulhaber" at "May 29, 2002 02:49:37 pm"
To: jedgar@FreeBSD.org (Chris D. Faulhaber)
Date: Fri, 31 May 2002 10:53:36 +0200 (SAT)
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

> jedgar      2002/05/29 14:49:37 PDT
> 
>   Modified files:
>     usr.sbin/named       Makefile 
>   Log:
>   Use the predefined DOCDIR instead of hard-coding /usr/share/doc/bind,
>   add support for DESTDIR.
>   
>   Revision  Changes    Path
>   1.31      +2 -3      src/usr.sbin/named/Makefile

This seems to break make release. I think DESTDIR is already included
in DOCDIR. Try "make -n install DESTDIR=/somewhere" in the named
directory and you will see that /somewhere is duplicated. Here is
a patch for that.

John
-- 
John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org


Index: usr.sbin/named/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/named/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- usr.sbin/named/Makefile	29 May 2002 21:49:37 -0000	1.31
+++ usr.sbin/named/Makefile	31 May 2002 08:38:26 -0000
@@ -36,10 +36,10 @@
 .PATH: ${BIND_DIR}/doc/html ${BIND_DIR}/doc/misc
 
 .for file in ${HTMLS}
-FILESDIR_${file}=	${DESTDIR}${DOCDIR}/bind/html
+FILESDIR_${file}=	${DOCDIR}/bind/html
 .endfor
 .for file in ${MISCS}
-FILESDIR_${file}=	${DESTDIR}${DOCDIR}/bind/misc
+FILESDIR_${file}=	${DOCDIR}/bind/misc
 .endfor
 
 .include <bsd.prog.mk>

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