From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8533F138334 for ; Sat, 20 Oct 2018 20:08:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C86B8E0866; Sat, 20 Oct 2018 20:08:52 +0000 (UTC) Received: from smtp.gentoo.org (unknown [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F3BFE0866 for ; Sat, 20 Oct 2018 20:08:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EA2A335CFC for ; Sat, 20 Oct 2018 20:08:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5220446 for ; Sat, 20 Oct 2018 20:08:29 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1540061751.e94b23e290b2a6a3c76fef471535608820e9f1fc.slyfox@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/site/, wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/Makefile wrappers/emerge-wrapper wrappers/site/config.site X-VCS-Directories: wrappers/site/ wrappers/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: e94b23e290b2a6a3c76fef471535608820e9f1fc X-VCS-Branch: master Date: Sat, 20 Oct 2018 20:08:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 079de464-6f2e-4620-af0b-28943c2786cd X-Archives-Hash: 57cc67659416cf77814ed16a5cc6d130 commit: e94b23e290b2a6a3c76fef471535608820e9f1fc Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Oct 20 18:55:51 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Oct 20 18:55:51 2018 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=e94b23e2 wrappers: use @TOPDIR@ and @PREFIX@ instead of __TOPDIR__ and __PREFIX__ Leave ____ substitutions for runtime substitution and keep @@ for 'make install' substitution. Signed-off-by: Sergei Trofimovich gentoo.org> wrappers/Makefile | 4 ++-- wrappers/emerge-wrapper | 4 ++-- wrappers/site/config.site | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wrappers/Makefile b/wrappers/Makefile index 15518bd..73f0dcc 100644 --- a/wrappers/Makefile +++ b/wrappers/Makefile @@ -17,8 +17,8 @@ install: cp -a etc $(DESTDIR)/$(PREFIX)/share/crossdev/ sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.conf cp -a site $(DESTDIR)/$(PREFIX)/share/crossdev/include/ - sed -i -e s@__PREFIX__@$(PREFIX)@g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper - sed -i -e s@__TOPDIR__@$(SITE)@g $(DESTDIR)/$(SITE)/config.site + sed -i -e s:@PREFIX@:$(PREFIX):g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper + sed -i -e s:@TOPDIR@:$(SITE):g $(DESTDIR)/$(SITE)/config.site mv $(DESTDIR)/$(SITE)/config.site $(DESTDIR)/$(PREFIX)/share/ ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.profile diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index d23d00e..fc53f2a 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -13,9 +13,9 @@ if [[ $1 == "--help" || $1 == "-h" ]] ; then exit 0 fi -PREFIX="__PREFIX__" +PREFIX="@PREFIX@" # Enable this script to be manually installed while debugging -[[ ${PREFIX} == \_\_\P\R\E\F\I\X\_\_ ]] && PREFIX="/usr" +[[ ${PREFIX} == "@"PREFIX"@" ]] && PREFIX="/usr" err() { echo "emerge-wrapper: $*" 1>&2; exit 1; } diff --git a/wrappers/site/config.site b/wrappers/site/config.site index 05c7823..44182a5 100755 --- a/wrappers/site/config.site +++ b/wrappers/site/config.site @@ -2,7 +2,7 @@ # Copyright 2009-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -TOPDIR=__TOPDIR__ +TOPDIR="@TOPDIR@" config_site_arch() { local host="${CHOST%%-*}"