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 1019C138334 for ; Mon, 13 Aug 2018 22:39:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFC08E0896; Mon, 13 Aug 2018 22:39:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 80C3EE0896 for ; Mon, 13 Aug 2018 22:39:46 +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 7B7B1335C63 for ; Mon, 13 Aug 2018 22:39:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 421433A2 for ; Mon, 13 Aug 2018 22:39:39 +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: <1534199780.39af3214ed29d9a3ca867988f7f2f3b995cafd66.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-config:master commit in: / X-VCS-Repository: proj/gcc-config X-VCS-Files: Makefile gcc-config X-VCS-Directories: / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 39af3214ed29d9a3ca867988f7f2f3b995cafd66 X-VCS-Branch: master Date: Mon, 13 Aug 2018 22:39:39 +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: 08973694-f957-45e1-8417-a8359e1cff85 X-Archives-Hash: 934c09521ad3e3025080bc722d97a9ba commit: 39af3214ed29d9a3ca867988f7f2f3b995cafd66 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Aug 13 22:36:20 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Aug 13 22:36:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=39af3214 rename installed binary wrapper from 'gcc-config' to 'wrapper' Before the change installed directory was: /usr/$(libexecdir)/misc/gcc-config /usr/bin/gcc-config After the change: /usr/$(libexecdir)/gcc-config/wrapper /usr/bin/gcc-config Should decrease confusion between a script and wrapper binary. Signed-off-by: Sergei Trofimovich gentoo.org> Makefile | 4 ++-- gcc-config | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e20f9f8..3cbb915 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ BINDIR = $(PREFIX)/bin ESELECTDIR = $(PREFIX)/share/eselect/modules SUBLIBDIR = lib LIBDIR = $(PREFIX)/$(SUBLIBDIR) -LIBEXECDIR = $(LIBDIR)/misc +LIBEXECDIR = $(LIBDIR)/$(PN) MKDIR_P = mkdir -p -m 755 INSTALL_EXE = install -m 755 @@ -35,7 +35,7 @@ clean: install: all $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBEXECDIR) $(DESTDIR)$(ESELECTDIR) - $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/$(PN) + $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/wrapper $(INSTALL_EXE) .gcc-config $(DESTDIR)$(BINDIR)/gcc-config $(INSTALL_DATA) gcc.eselect $(DESTDIR)$(ESELECTDIR) diff --git a/gcc-config b/gcc-config index db173f3..521e3ba 100755 --- a/gcc-config +++ b/gcc-config @@ -198,9 +198,9 @@ update_wrappers() { local x CTARGET=$1 # Find the bin wrapper - local wrapper - for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do - wrapper="${EROOT}usr/${wrapper}/misc/gcc-config" + local libdir wrapper + for libdir in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do + wrapper="${EROOT}usr/${libdir}/gcc-config/wrapper" [[ -e ${wrapper} ]] && break done