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 593C4138334 for ; Sat, 20 Oct 2018 20:08:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87609E085B; Sat, 20 Oct 2018 20:08:34 +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 5C946E085B for ; Sat, 20 Oct 2018 20:08:34 +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 2A26E335CF9 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 91FD5445 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: <1540061447.b29037535da7a3ff18d0506c94a41fbc4d24f4b3.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: b29037535da7a3ff18d0506c94a41fbc4d24f4b3 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: 3355778e-ced5-459f-a4b6-0ea588127c1e X-Archives-Hash: da4cb4b1391897f541053e5958836922 commit: b29037535da7a3ff18d0506c94a41fbc4d24f4b3 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Oct 20 18:50:47 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Oct 20 18:50:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=b2903753 makefile: use ':' separator in set expressions consistently Signed-off-by: Sergei Trofimovich gentoo.org> Makefile | 2 +- wrappers/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 40e45ee..7814eaf 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: 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 + 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 24880f7..15518bd 100644 --- a/wrappers/Makefile +++ b/wrappers/Makefile @@ -12,10 +12,10 @@ all: 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 + 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 + 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