Create an m4 directory for common macros and use it.

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 613965757a572b8c962632e02c69af48323593b1..facce0df51051692bb8ee7789f307d06b4bf916d 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 =
@@ -50,13 +52,16 @@ untabify:
        find \( -name '*.c' -o -name '*.h' \) -exec perl -i -pe 's/\t/        /g;' \{\} \;
 
 fedora-snapshot: dist
-       cp $(distdir).tar.gz $$HOME/cvs.fedora/pulseaudio/devel/$(distdir).svn`date +%Y%m%d`.tar.gz
+       cp $(distdir).tar.gz $$HOME/cvs.fedora/pulseaudio/devel/$(distdir).git`date +%Y%m%d`.tar.gz
 
 dist-hook:
-       if test -d .svn ; then \
-               svn update ; \
+       if test -d .git ; then \
+               git pull ; \
                chmod u+w ${distdir}/ChangeLog || true ; \
-               svn2cl -o ${distdir}/ChangeLog ; \
+               git-changelog.perl > ${distdir}/ChangeLog ; \
        fi
 
 .PHONY: homepage distcleancheck doxygen
+
+DISTCLEANFILES = \
+        po/.intltool-merge-cache