--- Makefile.orig	2003-10-19 17:57:59.000000000 -0700
+++ Makefile	2003-10-19 17:58:13.000000000 -0700
@@ -11,18 +11,18 @@
 
 
 
-main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
+main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
 
 install: $(DVB_LIBS) $(HEADERS)
-	[ ! -d "$(PREFIX)/lib" ] && mkdir -p $(PREFIX)/lib
-	install -m 644 $(DVB_LIBS) $(PREFIX)/lib/
-	[ ! -d "$(PREFIX)/include" ] && mkdir -p $(PREFIX)/include
-	install -m 644 $(HEADERS) $(PREFIX)/include/
+	[ ! -d "$(DESTDIR)/$(PREFIX)/lib" ] && mkdir -p $(DESTDIR)/$(PREFIX)/lib
+	install -m 644 $(DVB_LIBS) $(DESTDIR)/$(PREFIX)/lib/
+	[ ! -d "$(DESTDIR)/$(PREFIX)/include" ] && mkdir -p $(DESTDIR)/$(PREFIX)/include
+	install -m 644 $(HEADERS) $(DESTDIR)/$(PREFIX)/include/
 	make -C dvb-mpegtools install
 
 uninstall: 
-	for i in $(DVB_LIBS); do rm -f $(PREFIX)/lib/$$i;done
-	for i in $(HEADERS); do rm -f $(PREFIX)/$$i;done
+	for i in $(DVB_LIBS); do rm -f $(DESTDIR)/$(PREFIX)/lib/$$i;done
+	for i in $(HEADERS); do rm -f $(DESTDIR)/$(PREFIX)/$$i;done
 	make -C dvb-mpegtools uninstall
 
 libdvb.a: libdvb/libdvb.a
--- dvb-mpegtools/Makefile.orig	2003-10-19 17:58:29.000000000 -0700
+++ dvb-mpegtools/Makefile	2003-10-19 17:58:41.000000000 -0700
@@ -57,20 +57,20 @@
 	$(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
 
 install: dvb-mpegtools_main
-	install -D -m 755 dvb-mplex $(PREFIX)/bin/dvb-mplex
-	install -m 755 audiofilter $(PREFIX)/bin/
-	install -m 755 dvb-mpegtools_main $(PREFIX)/bin/
-	install -m 755 dvbaudio $(PREFIX)/bin/
+	install -D -m 755 dvb-mplex $(DESTDIR)/$(PREFIX)/bin/dvb-mplex
+	install -m 755 audiofilter $(DESTDIR)/$(PREFIX)/bin/
+	install -m 755 dvb-mpegtools_main $(DESTDIR)/$(PREFIX)/bin/
+	install -m 755 dvbaudio $(DESTDIR)/$(PREFIX)/bin/
 	for f in $(LINKS); do\
-		ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(PREFIX)/bin/$$f ;\
+		ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(DESTDIR)/$(PREFIX)/bin/$$f ;\
 	done
 
 uninstall:
-	for f in $(LINKS); do rm -f $(PREFIX)/bin/$$f;done
-	rm -f $(PREFIX)/bin/dvb-mpegtools_main
-	rm -f $(PREFIX)/bin/dvbaudio
-	rm -f $(PREFIX)/bin/audiofilter
-	rm -f $(PREFIX)/lib/libdvbmpegtools
+	for f in $(LINKS); do rm -f $(DESTDIR)/$(PREFIX)/bin/$$f;done
+	rm -f $(DESTDIR)/$(PREFIX)/bin/dvb-mpegtools_main
+	rm -f $(DESTDIR)/$(PREFIX)/bin/dvbaudio
+	rm -f $(DESTDIR)/$(PREFIX)/bin/audiofilter
+	rm -f $(DESTDIR)/$(PREFIX)/lib/libdvbmpegtools
 
 .depend: 
 	$(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend