diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-20 20:06:56 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-20 20:06:56 +0100 |
| commit | ef839047331b1fa2b44472e522235350e6cfe28c (patch) | |
| tree | a43a926429fda678ff3f19976905f7600ece0959 | |
| parent | wrappers: use @TOPDIR@ and @PREFIX@ instead of __TOPDIR__ and __PREFIX__ (diff) | |
| download | crossdev-ef839047331b1fa2b44472e522235350e6cfe28c.tar.gz crossdev-ef839047331b1fa2b44472e522235350e6cfe28c.tar.bz2 crossdev-ef839047331b1fa2b44472e522235350e6cfe28c.zip | |
Makefile: avoid '//' when PREFIX is not set
PREFIX assumes leading '/'. Thus the idiom is
$(DESTDIR)$(PREFIX)/foo
and not
$(DESTDIR)/$(PREFIX)/foo
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | wrappers/Makefile | 22 |
2 files changed, 14 insertions, 14 deletions
@@ -6,9 +6,9 @@ include settings.mk 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 + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL_EXEC) crossdev $(DESTDIR)$(PREFIX)/bin/ + 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 73f0dcc..7cbe72f 100644 --- a/wrappers/Makefile +++ b/wrappers/Makefile @@ -10,16 +10,16 @@ SITE = $(PREFIX)/share/crossdev/include/site 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 - 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 - mv $(DESTDIR)/$(SITE)/config.site $(DESTDIR)/$(PREFIX)/share/ - ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.profile + $(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 + 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 + mv $(DESTDIR)$(SITE)/config.site $(DESTDIR)$(PREFIX)/share/ + ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)$(PREFIX)/share/crossdev/etc/portage/make.profile .PHONY: all install |