From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-497728-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id A40C0138010
	for <garchives@archives.gentoo.org>; Mon, 20 Aug 2012 21:37:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6D0DBE07A5;
	Mon, 20 Aug 2012 21:36:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3C504E07A5
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Aug 2012 21:36:55 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A2CF91B4225
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Aug 2012 21:36:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 6458DE543D
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Aug 2012 21:36:53 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1345498568.9e97e5847da804a7cf20110c8f7bc31049ff30d7.vapier@gentoo>
Subject: [gentoo-commits] proj/crossdev:master commit in: /
X-VCS-Repository: proj/crossdev
X-VCS-Files: settings.mk
X-VCS-Directories: /
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 9e97e5847da804a7cf20110c8f7bc31049ff30d7
X-VCS-Branch: master
Date: Mon, 20 Aug 2012 21:36:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 540155cd-eeef-4e88-9eae-f8720c5f2781
X-Archives-Hash: 32f58c5f96cbf3819e27c4bf6e6d03e0

commit:     9e97e5847da804a7cf20110c8f7bc31049ff30d7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 20 21:34:46 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 21:36:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=9e97e584

utilize $EPREFIX in the env if it is set

Fix handling of EPREFIX -- it should prefix /usr, not replace it.

URL: https://bugs.gentoo.org/423711
Reported-by: Alessandro Surace <linuxale <AT> libero.it>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 settings.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.mk b/settings.mk
index dba6419..30434d6 100644
--- a/settings.mk
+++ b/settings.mk
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 DESTDIR ?=
-EPREFIX ?= /usr
-PREFIX ?= $(EPREFIX)
+EPREFIX ?=
+PREFIX ?= $(EPREFIX)/usr
 
 INSTALL_DIR  = install -m 755 -d
 INSTALL_EXEC = install -m 755