[SCM] morituri/master: * Makefile.am: * doc/Makefile.am: Adapt to changing over to git module for python-command

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5173f99b7a09daba2a224fb626350ade41e2e7bd
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Nov 18 15:15:04 2012 +0000

    	* Makefile.am:
    	* doc/Makefile.am:
    	  Adapt to changing over to git module for python-command

diff --git a/ChangeLog b/ChangeLog
index c590090..cd3e5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-11-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* Makefile.am:
+	* doc/Makefile.am:
+	  Adapt to changing over to git module for python-command
+
+2012-11-18  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/extern/task/gstreamer.py:
 	  Fix wrong commit made to fix #89.
 
diff --git a/Makefile.am b/Makefile.am
index f8ef69f..0352bfd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.8 dist-bzip2 no-dist-gzip
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = bin etc morituri doc m4 misc
+SUBDIRS = morituri bin etc doc m4 misc
 
 EXTRA_DIST = morituri.spec morituri.doap RELEASE README HACKING
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 16e57ed..818a0a8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,8 +23,8 @@ morituri.ics: $(top_srcdir)/morituri.doap
 
 man_MANS = 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
+rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
+	PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
 
 clean-local:
 	@rm -rf reference

-- 
morituri packaging