diff options
Diffstat (limited to 'wrappers')
| -rw-r--r-- | wrappers/Makefile | 8 | ||||
| -rwxr-xr-x | 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 } |