fixed mistake for emake:-all emake:-install between old and new plugin makefile structur, vdr-plugin-2.eclass

1 files changed, 27 insertions, 24 deletions

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index adac9cbe0ed9..a818ad8735e0 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.17 2012/12/31 19:49:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.18 2013/01/03 20:30:47 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -543,26 +543,14 @@ vdr-plugin-2_src_compile() {
 			fi
 			cd "${S}"
 
-			local SOFILE_STRING=$(grep SOFILE Makefile)
-			if [[ -n ${SOFILE_STRING} ]]; then
-			dev_check "compiling with new Makefile handling"
-			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
-				emake ${BUILD_PARAMS} \
-					${BUILD_TARGETS} \
-					LOCDIR="${TMP_LOCALE_DIR}" \
-					LIBDIR="${S}" \
-					TMPDIR="${T}" \
-					|| die "emake failed"
-			else
-			dev_check "compiling with old Makefile handling"
 			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }}
 				emake ${BUILD_PARAMS} \
 					${BUILD_TARGETS} \
 					LOCALEDIR="${TMP_LOCALE_DIR}" \
+					LOCDIR="${TMP_LOCALE_DIR}" \
 					LIBDIR="${S}" \
 					TMPDIR="${T}" \
 					|| die "emake failed"
-			fi
 			;;
 		esac
 
@@ -603,9 +591,33 @@ vdr-plugin-2_src_install() {
 
 	cd "${S}"
 
+	local SOFILE_STRING=$(grep SOFILE Makefile)
+	if [[ -n ${SOFILE_STRING} ]]; then
+		dev_check "installing with new Makefile handling"
+		BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
+		einstall ${BUILD_PARAMS} \
+			${BUILD_TARGETS} \
+			LOCDIR="${TMP_LOCALE_DIR}" \
+			LIBDIR="${S}" \
+			TMPDIR="${T}" \
+			DESTDIR="${D}" \
+			|| die "einstall (makefile target) failed"
+	fi
+
 	insinto "${VDR_PLUGIN_DIR}"
 	doins libvdr-*.so.*
 
+	if [[ -d ${TMP_LOCALE_DIR} ]]; then
+		einfo "Installing locales"
+		cd "${TMP_LOCALE_DIR}"
+
+		local linguas
+		for linguas in ${LINGUAS[*]}; do
+		insinto "${LOCDIR}"
+		cp -r --parents ${linguas}* ${D}/${LOCDIR}
+		done
+	fi
+
 	# create list of all created plugin libs
 	vdr_plugin_list=""
 	local p_name
@@ -618,15 +630,6 @@ vdr-plugin-2_src_install() {
 	create_header_checksum_file ${vdr_plugin_list}
 	create_plugindb_file ${vdr_plugin_list}
 
-	if [[ -d ${TMP_LOCALE_DIR} ]]; then
-		einfo "Installing locales"
-		cd "${TMP_LOCALE_DIR}"
-		local linguas
-		for linguas in ${LINGUAS[*]}; do
-			insinto "${LOCDIR}"
-			cp -r --parents ${linguas}* ${D}/${LOCDIR}
-		done
-	fi
 
 	cd "${S}"
 	local docfile