Merge commit 'flameeyes/flameeyes'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b32b46e99afa708ff2dafaa17b9fd8213a4de7db..8735d312be5cb4cda822b9d5203609c1fb6e72dd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+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
+SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -54,9 +56,12 @@ 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
 
 .PHONY: homepage distcleancheck doxygen
+
+DISTCLEANFILES = \
+        po/.intltool-merge-cache