Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/baselayout:master commit in: /
Date: Mon, 27 Sep 2021 20:56:43
Message-Id: 1632776195.a3e35578740551f78a8fa44b51143865ca16c4a9.williamh@gentoo
1 commit: a3e35578740551f78a8fa44b51143865ca16c4a9
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 27 20:49:21 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 27 20:56:35 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=a3e35578
7
8 clean up makefile
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 Makefile | 7 +++++--
13 1 file changed, 5 insertions(+), 2 deletions(-)
14
15 diff --git a/Makefile b/Makefile
16 index aaae44ad..8c6f026f 100644
17 --- a/Makefile
18 +++ b/Makefile
19 @@ -64,10 +64,13 @@ install:
20 $(INSTALL_DIR) $(DESTDIR)/etc
21 cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
22 echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
23 + $(INSTALL_DIR) $(DESTDIR)/lib
24 + cp -pPR lib.$(OS)/* $(DESTDIR)/etc/
25 + $(INSTALL_DIR) $(DESTDIR)/usr/lib
26 + ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
27 + ./make_os_release ${OS} ${PV} > $(DESTDIR)/usr/lib/os-release
28 $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
29 cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
30 - ./make_os_release $(OS) $(PV) > $(DESTDIR)/usr/lib/os-release
31 - ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
32
33 layout-dirs:
34 # Create base filesytem layout