[gentoo-commits] proj/crossdev:master commit in: wrappers/site/, wrappers/

[gentoo-commits] proj/crossdev:master commit in: wrappers/site/, wrappers/

[Sergei Trofimovich]

commit:     bd54f7ece1a03a406cbd3789f0dc2fd6f1742efc
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 19:17:53 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 19:17:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=bd54f7ec

wrappers/Makefile: rename TOPDIR to SITEDIR

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 wrappers/Makefile         | 8 ++++----
 wrappers/site/config.site | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wrappers/Makefile b/wrappers/Makefile
index 7cbe72f..4aee778 100644
--- a/wrappers/Makefile
+++ b/wrappers/Makefile
@@ -5,12 +5,12 @@ include ../settings.mk
 
 PORTDIR ?= $(shell portageq envvar PORTDIR)
 FNAMES = cross-emerge  cross-fix-root  cross-pkg-config  emerge-wrapper
-SITE = $(PREFIX)/share/crossdev/include/site
+SITEDIR = $(PREFIX)/share/crossdev/include/site
 
 all:
 
 install:
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(SITE)
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(SITEDIR)
 	$(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
@@ -18,8 +18,8 @@ install:
 	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
-	mv $(DESTDIR)$(SITE)/config.site $(DESTDIR)$(PREFIX)/share/
+	sed -i -e s:@SITEDIR@:$(SITEDIR):g $(DESTDIR)$(SITEDIR)/config.site
+	mv $(DESTDIR)$(SITEDIR)/config.site $(DESTDIR)$(PREFIX)/share/
 	ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)$(PREFIX)/share/crossdev/etc/portage/make.profile
 
 .PHONY: all install

diff --git a/wrappers/site/config.site b/wrappers/site/config.site
index 44182a5..8205657 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@"
+SITEDIR="@SITEDIR@"
 
 config_site_arch() {
 	local host="${CHOST%%-*}"
@@ -40,7 +40,7 @@ config_site_names() {
 	esac
 
 	for x in ${sites} ${CHOST}; do
-		[ -e "${TOPDIR}/${x}" ] && echo "${TOPDIR}/${x}"
+		[ -e "${SITEDIR}/${x}" ] && echo "${SITEDIR}/${x}"
 	done
 }
 

[gentoo-commits] proj/crossdev:master commit in: wrappers/site/, wrappers/

[Sergei Trofimovich]

commit:     e94b23e290b2a6a3c76fef471535608820e9f1fc
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 18:55:51 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 __<var>__ substitutions for runtime substitution
and keep @<var>@ for 'make install' substitution.

Signed-off-by: Sergei Trofimovich <slyfox <AT> 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%%-*}"