[SCM] morituri/master: * doc/Makefile.am: Don't put rip.1 manpage in subdir.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ecd6e15783b2f0f99c3abce55312574cd744f3f9
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Apr 4 23:54:41 2010 +0000

    	* doc/Makefile.am:
    	  Don't put rip.1 manpage in subdir.

diff --git a/ChangeLog b/ChangeLog
index 86235f1..6f578ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-05  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* doc/Makefile.am:
+	  Don't put rip.1 manpage in subdir.
+
+2010-04-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/common.py:
 	  add quoteParse function to quote properly for gst.parse_launch()
 	* morituri/common/checksum.py:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bce5e37..f773942 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,10 +20,10 @@ morituri.rss2: $(top_srcdir)/morituri.doap
 morituri.ics: $(top_srcdir)/morituri.doap
 	-moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
 
-man_MANS = man/rip.1
+man_MANS = rip.1
 
-man/rip.1: $(top_srcdir)/morituri/extern/command/help2man.py $(top_srcdir)/morituri
-	PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/command/help2man.py morituri.rip.main.Rip rip > man/rip.1
+rip.1: $(top_srcdir)/morituri/extern/command/help2man.py $(top_srcdir)/morituri
+	PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/command/help2man.py morituri.rip.main.Rip rip > rip.1
 
 clean-local:
 	@rm -rf reference

-- 
morituri packaging