summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2008-04-23 13:56:20 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2008-04-23 13:56:20 +0000
commitcca286385838dcf7b9f67fd85c3ba93638c061a5 (patch)
treeedb637b665e07cdd80d22e3c86f2ce3776130f6f /eclass/vdr-plugin.eclass
parentversion bump for new IceRuby, currently package.masked (diff)
downloadhistorical-cca286385838dcf7b9f67fd85c3ba93638c061a5.tar.gz
historical-cca286385838dcf7b9f67fd85c3ba93638c061a5.tar.bz2
historical-cca286385838dcf7b9f67fd85c3ba93638c061a5.zip
Remove maybe unset DVBDIR variable from list of includes.
Diffstat (limited to 'eclass/vdr-plugin.eclass')
-rw-r--r--eclass/vdr-plugin.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass
index 81be9cda64f6..665341dd7711 100644
--- a/eclass/vdr-plugin.eclass
+++ b/eclass/vdr-plugin.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.58 2008/04/22 11:04:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.59 2008/04/23 13:56:20 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -170,7 +170,8 @@ vdr_patchmakefile() {
-e "s:^TMPDIR.*$:TMPDIR = ${T}:" \
-e 's:-I$(VDRDIR)/include:-I'"${VDR_INCLUDE_DIR%vdr}"':' \
-e "/^DVBDIR/d" \
- -e 's:-I$(DVBDIR)/include::'
+ -e 's:-I$(DVBDIR)/include::' \
+ -e 's:-I$(DVBDIR)::'
eend $?
# maybe needed for multiproto:
@@ -297,6 +298,7 @@ vdr-plugin_copy_source_tree() {
cp -r "${S}" "${T}"/source-tree
cd "${T}"/source-tree
cp "${WORKDIR}"/Makefile.before Makefile
+ # TODO: Fix this, maybe no longer needed
sed -i Makefile \
-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-e 's:^CXXFLAGS:#CXXFLAGS:' \