[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/

[William Hubbs]

commit:     9a9deabd0fe4d01d457ef808e6fdaac36bd1ef81
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 20:29:10 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 20:38:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9deabd

Revert "sys-apps/baselayout: stop using install target in makefile"

This reverts commit d2c10afa5573e5efaf1f6845cb47e3f8cc226812.
It will be cleaner to use the Makefile where possible.

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/baselayout/baselayout-9999.ebuild | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 9988d48fbad..5df53f3739a 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -244,27 +244,20 @@ src_prepare() {
 }
 
 src_install() {
-	local OS="$(usex kernel_linux 'Linux' 'BSD')"
-	insinto /etc
-	doins -r etc/* etc.${OS}/*
-	printf '%s\n' "Gentoo Base System release ${PV}" > "${T}"/gentoo-release
-	doins "${T}"/gentoo-release
-	dosym ../usr/lib/os-release /etc/os-release
-
+	dodir /usr/lib
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
 	if use kernel_linux; then
 		insinto /lib
 		doins -r lib.Linux/*
 	fi
-	insinto /usr/lib
-	./make_os_release ${OS} ${PV} > "${T}"/os-release
-	doins "${T}"/os-release
+	dodoc ChangeLog
 
-	insinto /usr/share/${PN}
-	doins -r share.${OS}/*
 	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
 	doins Makefile
-
-	dodoc ChangeLog
 }
 
 pkg_postinst() {