Simplify src_compile/src_install a bit -- no real functional changes.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

2 files changed, 16 insertions, 18 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index e3889eefa205..7b7b8df09b54 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.173 2014/01/31 08:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.174 2014/01/31 08:17:39 vapier Exp $
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-tools-2.4.7.ebuild:
+  Simplify src_compile/src_install a bit -- no real functional changes.
 
   31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-tools-2.4.7.ebuild:
   Convert myconf to an array to make it easier to maintain.
diff --git a/app-admin/apache-tools/apache-tools-2.4.7.ebuild b/app-admin/apache-tools/apache-tools-2.4.7.ebuild
index 528f237d3c24..6527fa8dfac1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.7.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v 1.5 2014/01/31 08:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v 1.6 2014/01/31 08:17:39 vapier Exp $
 
 EAPI=5
 inherit flag-o-matic eutils multilib
@@ -51,32 +51,27 @@ src_configure() {
 }
 
 src_compile() {
-	cd support || die
-	emake
+	emake -C support
 }
 
 src_install() {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs}.8
+	make -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
 
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
-	pushd "${ED}"/usr/sbin/ >/dev/null
+	pushd "${ED}"/usr/sbin >/dev/null
+	local i
 	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
+		dosym ${i} /usr/sbin/${i}2
 	done
-	popd "${ED}"/usr/sbin/ >/dev/null
+	popd >/dev/null
 
 	# Provide a symlink for ab-ssl
 	if use ssl; then
-		dosym /usr/bin/ab /usr/bin/ab-ssl
-		dosym /usr/bin/ab /usr/bin/ab2-ssl
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
 	fi
-
-	dodoc "${S}"/CHANGES
 }