[gentoo-commits] proj/baselayout:master commit in: /

[William Hubbs]

commit:     77e9c6f275399cdef64d432a19da51bc9c9cd0bf
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 22:03:50 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 22:03:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=77e9c6f2

add layout-usrmerge to optionally support the /usr merge

 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 9181c7d7..966e71ac 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,11 @@ layout: layout-dirs layout-$(OS)
        # FHS compatibility symlinks stuff
        ln -snf /var/tmp $(DESTDIR)/usr/tmp
 
+layout-usrmerge: layout
+       ln -snf usr/bin ${DESTDIR}/bin
+       ln -snf usr/sbin ${DESTDIR}/sbin
+       ln -snf bin ${DESTDIR}/usr/sbin
+
 live:
        rm -rf /tmp/$(PKG)
        cp -r . /tmp/$(PKG)