[patch] Patch for ugly include handling

vdr-plugin.eclass.diff (text/plain), 1.36 KB, created by ml on 2006-08-07 07:13:49 UTC

--- vdr-plugin.eclass.origin	2006-07-19 22:36:27.000000000 +0200
+++ vdr-plugin.eclass	2006-08-07 15:51:03.433633472 +0200
@@ -113,12 +113,12 @@
 	VDR_RC_DIR="/usr/lib/vdr/rcscript"
 
 	# Pathes to includes
-	VDR_INCLUDE_DIR="/usr/include"
+	VDR_INCLUDE_DIR="/usr/include/vdr"
 	DVB_INCLUDE_DIR="/usr/include"
 
 
-	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/vdr/config.h)
-	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/vdr/config.h)
+	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
+	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
 	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
 
 	einfo "Building ${PF} against vdr-${VDRVERSION}"
@@ -159,7 +159,7 @@
 				-e 's:-I$(VDRDIR)/include:-I$(VDRDIR):' \
 				-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
 				-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):' \
-				-e 's:$(VDRDIR)/\([a-z]*\.h\|Make.config\):$(VDRDIR)/vdr/\1:'
+				-e 's:$(VDRDIR)/\([a-z]*\.h\|Make.config\):$(VDRDIR)/\1:'
 			eend $?
 
 			ebegin "  Converting to APIVERSION"
@@ -293,7 +293,7 @@
 		if which md5sum >/dev/null 2>&1; then
 			cd ${S}
 			(
-				cd ${ROOT}${VDR_INCLUDE_DIR}/vdr
+				cd ${ROOT}${VDR_INCLUDE_DIR}
 				md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
 			) > header-md5-${PN}
 			doins header-md5-${PN}