From owner-p4-projects@FreeBSD.ORG  Tue May 30 11:31:50 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D9F616A438; Tue, 30 May 2006 11:31:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C4C4A16A41F
	for <perforce@freebsd.org>; Tue, 30 May 2006 11:31:49 +0000 (UTC)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7D80D43D48
	for <perforce@freebsd.org>; Tue, 30 May 2006 11:31:49 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UBUWa2057871
	for <perforce@freebsd.org>; Tue, 30 May 2006 11:30:32 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UBUWsR057868
	for perforce@freebsd.org; Tue, 30 May 2006 11:30:32 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Tue, 30 May 2006 11:30:32 GMT
Message-Id: <200605301130.k4UBUWsR057868@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 98122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 May 2006 11:31:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=98122

Change 98122 by soc-andrew@soc-andrew_serv on 2006/05/30 11:29:40

	Fix a problem where DESTDIR was added to a directory twice
	Split a long line to be under 80 chars

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 (text+ko) ====

@@ -1,3 +1,3 @@
 BSD_INSTALLER_LUA_DIR=${.CURDIR}/../../../contrib/bsdinstaller/backend/lua
 
-INST_DIR=${DESTDIR}/usr/libexec/bsdinstaller
+INST_DIR=/usr/libexec/bsdinstaller

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 LANGUAGES=	en
-LOCALEDIR=	${INST_DIR}/locale
+LOCALEDIR=	${DESTDIR}/${INST_DIR}/locale
 
 all:
 	@true
@@ -8,7 +8,8 @@
 # This is not a problem for the release scripts as they can install gettext
 all-nls:
 	for _language in ${LANGUAGES}; do \
-		msgfmt -o ${.OBJDIR}/$${_language}.mo ${.CURDIR}/$${_language}.po; \
+		msgfmt -o ${.OBJDIR}/$${_language}.mo \
+		    ${.CURDIR}/$${_language}.po; \
 	done
 
 clean-nls: