[gentoo-commits] proj/gcc-config:master commit in: /

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     39af3214ed29d9a3ca867988f7f2f3b995cafd66
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 22:36:20 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 <slyfox <AT> 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