Merge remote-tracking branch 'mkbosmans/mingw32-build'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a8a9eaacafa9d6b409012b09ffa2cf61d7be3ee9..ca43de108af306247b47b3e06824c8431634fa8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,8 +72,8 @@ fedora-snapshot: dist
 
 dist-hook:
        if test -d .git ; then \
-               test -z $$SKIP_GIT && git pull ; \
-               chmod u+w ${distdir}/ChangeLog || true ; \
+               test -z $$USE_GIT || git pull ; \
+               test -f ${distdir}/ChangeLog && chmod u+w ${distdir}/ChangeLog ; \
                ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \
        fi
        echo $(VERSION) > $(distdir)/.tarball-version