From 7b3decdaf3a5695e90fa07563511af8d0111f181 Mon Sep 17 00:00:00 2001
From: too-tired <too-tired@36490176-9c1c-0410-b649-dbf2af5787bf>
Date: Sun, 28 Jun 2009 22:46:25 +0000
Subject: [PATCH] build fixes; add bindist target

git-svn-id: https://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk@166 36490176-9c1c-0410-b649-dbf2af5787bf
---
 ChangeLog   |  7 +++++++
 makefile.in | 14 +++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f5e417..5996988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-28  Michael Riepe  <too-tired@users.sourceforge.net>
+
+	* makefile.in:
+		Fix stamp-dist dependencies.
+		Fix non-POSIX sort command.
+		Add bindist target.
+
 2009-06-27  Michael Riepe  <too-tired@users.sourceforge.net>
 
 	* src/dvbcut.cpp:
diff --git a/makefile.in b/makefile.in
index c80555f..7d2ed98 100644
--- a/makefile.in
+++ b/makefile.in
@@ -66,8 +66,8 @@ src/version.h: $(DISTFILES)
 	$(SHELL) ./setversion.sh $(DISTFILES)
 
 distdir = dvbcut-$(VERSION)
-dist: ./stamp-dist
-./stamp-dist: distfiles $(DISTFILES)
+dist: distfiles ./stamp-dist
+./stamp-dist: $(DISTFILES)
 	rm -rf $(distdir)
 	mkdir $(distdir)
 	files="$(DISTFILES)"; for file in $$files; do \
@@ -78,7 +78,7 @@ dist: ./stamp-dist
 	cd $(distdir) && $(SHELL) ./setversion.sh $(DISTFILES)
 	cd $(distdir) && \
 		find . -type f ! -name MANIFEST -exec wc -c {} \; | \
-		sort +1 >MANIFEST
+		sort -k 2 >MANIFEST
 	-@rm -f $(distdir).tar.gz.bak dvbcut.tar.gz
 	-@mv -f $(distdir).tar.gz $(distdir).tar.gz.bak
 	tar cvohfz $(distdir).tar.gz --numeric-owner --owner=0 --group=0 $(distdir)
@@ -92,4 +92,12 @@ check-dist:
 	$(MAKE) -C $(distdir)
 	$(MAKE) -C $(distdir) check
 	$(MAKE) -C $(distdir) dist
+	diff $(distdir)/MANIFEST $(distdir)/$(distdir)/MANIFEST
+
+bindist: all
+	dir=$(distdir)-`arch`; \
+	rm -rf $$dir; \
+	make install DESTDIR=`pwd`/$$dir && \
+	cd $$dir && \
+	tar cvofz ../$$dir.tar.gz --numeric-owner --owner=0 --group=0 *