Merge commit 'origin/master-tx'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 63c04ee1534832e443ff2925a21e6e68c0c3da09..9a3ca7b719d7d80a87b03460bb528eda71fa077a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS=src doxygen man po
+SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -56,11 +56,17 @@ fedora-snapshot: dist
 
 dist-hook:
        if test -d .git ; then \
-               git pull ; \
+               test -z $$SKIP_GIT && git pull ; \
                chmod u+w ${distdir}/ChangeLog || true ; \
-               git-changelog.perl > ${distdir}/ChangeLog ; \
+               ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \
        fi
 
+update-shave:
+       for i in shave.in shave.m4 shave-libtool.in; do \
+               wget -O $$i http://git.lespiau.name/cgit/shave/blob/\?path=shave/$$i ; \
+       done
+       mv shave.m4 m4/
+
 .PHONY: homepage distcleancheck doxygen
 
 DISTCLEANFILES = \