diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-08 21:18:15 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-08 21:18:15 +0100 |
| commit | c2002dcd1f769e0a54976ad2d586a29c9316ffce (patch) | |
| tree | 8f813de017886d395dd8741aa1cc794a6409d63a /Makefile.am | |
| parent | 9fc726c6d780f63610647014efeffab3a97b8dac (diff) | |
| parent | 7ca0f384c8b122f6acb3547d20ca3a838507a038 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b27f9e65..f4dd9989 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ 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 libltdl +SUBDIRS = libltdl src doxygen man po MAINTAINERCLEANFILES = noinst_DATA = @@ -56,7 +56,7 @@ 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 || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \ fi |