| 1 |
commit: 9bbb700a3bfeaca7307a154564db00feff201e6e |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 7 18:58:07 2018 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 7 19:05:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=9bbb700a |
| 7 |
|
| 8 |
Makefile: layout-usrmerge should do nothing on non-Linux systems |
| 9 |
|
| 10 |
Makefile | 2 ++ |
| 11 |
1 file changed, 2 insertions(+) |
| 12 |
|
| 13 |
diff --git a/Makefile b/Makefile |
| 14 |
index 35bdb627..f1b0344d 100644 |
| 15 |
--- a/Makefile |
| 16 |
+++ b/Makefile |
| 17 |
@@ -86,9 +86,11 @@ layout: layout-dirs layout-$(OS) |
| 18 |
ln -snf /var/tmp $(DESTDIR)/usr/tmp |
| 19 |
|
| 20 |
layout-usrmerge: layout |
| 21 |
+ifeq ($(OS),Linux) |
| 22 |
ln -snf usr/bin ${DESTDIR}/bin |
| 23 |
ln -snf usr/sbin ${DESTDIR}/sbin |
| 24 |
ln -snf bin ${DESTDIR}/usr/sbin |
| 25 |
+endif |
| 26 |
|
| 27 |
live: |
| 28 |
rm -rf /tmp/$(PKG) |
Archives