summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2013-01-27 10:17:13 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2013-01-27 10:17:13 +0000
commit097918d5118aa392bbf9dedd3cd06c2930667b7f (patch)
treef5c4a627f47a158aba53b2ad39186c1f1fd04020 /eclass
parentversion bump, bug #454246 (diff)
downloadgentoo-2-097918d5118aa392bbf9dedd3cd06c2930667b7f.tar.gz
gentoo-2-097918d5118aa392bbf9dedd3cd06c2930667b7f.tar.bz2
gentoo-2-097918d5118aa392bbf9dedd3cd06c2930667b7f.zip
some fixes, install new makefilehandling; thx to zoolock@irc gentoo.vdr
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/vdr-plugin-2.eclass12
2 files changed, 9 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 53761d247add..bcb7d060cfaf 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.641 2013/01/26 15:01:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.642 2013/01/27 10:17:13 hd_brummy Exp $
+
+ 27 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+ some fixes, install new makefilehandling; thx to zoolock@irc gentoo.vdr
26 Jan 2013; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
Supporting removal of SELinux modules
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index 77262970689f..22b341885971 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
# 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.19 2013/01/04 13:23:43 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.20 2013/01/27 10:17:13 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
@@ -593,20 +593,18 @@ vdr-plugin-2_src_install() {
local SOFILE_STRING=$(grep SOFILE Makefile)
if [[ -n ${SOFILE_STRING} ]]; then
- dev_check "installing with new Makefile handling"
+ dev_check "einstall 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"
+ else
+ insinto "${VDR_PLUGIN_DIR}"
+ doins libvdr-*.so.*
fi
- insinto "${VDR_PLUGIN_DIR}"
- doins libvdr-*.so.*
-
if [[ -d ${TMP_LOCALE_DIR} ]]; then
einfo "Installing locales"
cd "${TMP_LOCALE_DIR}"