fix pbuilder package building

opdenkamp · May 21, 2011 · fb0a92f · fb0a92f
1 parent 8281379
commit fb0a92f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/debian/control b/debian/control
@@ -1,8 +1,8 @@
 Source: tvheadend
-Section: main
+Section: video
 Priority: extra
 Maintainer: Andreas Öman <andreas@lonelycoder.com>
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), pkg-config, libavahi-client-dev, libssl-dev
 Standards-Version: 3.7.3
 
 Package: tvheadend

diff --git a/debian/rules b/debian/rules
@@ -25,10 +25,14 @@ override_dh_auto_build:
 	$(MAKE)
 
 override_dh_install:
-	$(MAKE) prefix=$(CURDIR)/debian/tvheadend/usr install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tvheadend install
 
 override_dh_installinit:
 	dh_installinit --name tvheadend	
 
 override_dh_strip:
-        dh_strip --dbg-package=tvheadend-dbg
+	dh_strip --dbg-package=tvheadend-dbg
+
+override_dh_autotest:
+	echo "skipped autotest"
+
diff --git a/support/posix.mk b/support/posix.mk
@@ -1,23 +1,21 @@
 
 INSTBIN=  ${DESTDIR}${INSTALLPREFIX}/bin
 INSTMAN=  ${DESTDIR}${INSTALLPREFIX}/share/man1
-INSTDBG=  ${DESTDIR}/usr/lib/debug/${INSTALLPREFIX}/bin
+INSTDBG=  ${DESTDIR}${INSTALLPREFIX}/lib/debug/bin
 MAN=man/tvheadend.1
 
 install: ${PROG} ${MAN}
 	mkdir -p ${INSTBIN}
-	mkdir -p ${INSTDBG}
 	install -T ${PROG} ${INSTBIN}/tvheadend
+	mkdir -p ${INSTMAN}
+	install ${MAN} ${INSTMAN}
 
+install-debug: ${PROG}
+	mkdir -p ${INSTDBG}
 	objcopy --only-keep-debug ${INSTBIN}/tvheadend ${INSTDBG}/tvheadend.debug
 	strip -g ${INSTBIN}/tvheadend
-
 	objcopy --add-gnu-debuglink=${INSTDBG}/tvheadend.debug ${INSTBIN}/tvheadend
 
-
-	mkdir -p ${INSTMAN}
-	install ${MAN} ${INSTMAN}
-
 uninstall:
 	rm -f ${INSTBIN}/tvheadend
 	rm -f ${INSTDBG}/tvheadend.debug