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 9BB0B138334 for ; Sat, 20 Oct 2018 20:08:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF055E085E; Sat, 20 Oct 2018 20:08:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [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 8262EE085E for ; Sat, 20 Oct 2018 20:08:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 27A2F335CF5 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 7F4CD43C 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: <1540060781.d292392962718567fc3d6931b1cd2e544b9d179e.slyfox@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: /, wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: Makefile wrappers/Makefile X-VCS-Directories: wrappers/ / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: d292392962718567fc3d6931b1cd2e544b9d179e 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: 65478fd0-27df-45fc-8997-5771156a24d0 X-Archives-Hash: 066b313ad719d63e6760588a103c6996 commit: d292392962718567fc3d6931b1cd2e544b9d179e Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Oct 20 18:39:41 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Oct 20 18:39:41 2018 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d2923929 Makefile: mangle files with sed at install phase Signed-off-by: Sergei Trofimovich gentoo.org> Makefile | 3 +-- wrappers/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 26c5b37..40e45ee 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,11 @@ include settings.mk all: - sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" crossdev - $(MAKE) -C wrappers install: $(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/ $(INSTALL_EXEC) crossdev $(DESTDIR)/$(PREFIX)/bin/ + sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/crossdev $(MAKE) -C wrappers install PV = $(shell test -e .git && date --date="`git log -1 --format=%ci`" +%Y%m%d) diff --git a/wrappers/Makefile b/wrappers/Makefile index edb6a26..24880f7 100644 --- a/wrappers/Makefile +++ b/wrappers/Makefile @@ -8,14 +8,14 @@ FNAMES = cross-emerge cross-fix-root cross-pkg-config emerge-wrapper SITE = $(PREFIX)/share/crossdev/include/site all: - sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" cross-emerge - sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" emerge-wrapper - sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" etc/portage/make.conf install: $(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/ $(DESTDIR)/$(SITE) $(INSTALL_EXEC) $(FNAMES) $(DESTDIR)/$(PREFIX)/bin/ + sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/cross-emerge + sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper 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