[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

["Joerg Bornkessel (hd_brummy)" <hd_brummy@gentoo.org>]

hd_brummy    13/01/03 20:30:47

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

Revision  Changes    Path
1.593                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.593&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.593&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.592&r2=1.593

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- ChangeLog	3 Jan 2013 19:22:05 -0000	1.592
+++ ChangeLog	3 Jan 2013 20:30:47 -0000	1.593
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.592 2013/01/03 19:22:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.593 2013/01/03 20:30:47 hd_brummy Exp $
+
+  03 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed mistake for emake:-all emake:-install between old and new plugin
+  makefile structur, vdr-plugin-2.eclass
 
   03 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> ssl-cert.eclass:
   Support mandatory enrollment and custom USE flag, bug#319529.



1.18                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.17&r2=1.18

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vdr-plugin-2.eclass	31 Dec 2012 19:49:41 -0000	1.17
+++ vdr-plugin-2.eclass	3 Jan 2013 20:30:47 -0000	1.18
@@ -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 @@
 			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 @@
 
 	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 @@
 	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