summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2011-06-13 23:14:39 +0100
committerEmmanuele Bassi <ebassi@linux.intel.com>2011-06-13 23:15:17 +0100
commit86d96dbcc1bb38cef0a1b6ac176d6af1943088a9 (patch)
tree99ac6d4ebc4c889e6e9700cb07ad9acc8b13a8ba
parente8bd46b82b1f62082440eb8e5ebe2bc1f1c0c540 (diff)
downloadclutter-86d96dbcc1bb38cef0a1b6ac176d6af1943088a9.tar.gz
build: Put back ChangeLog.pre-git-import to unbreak distcheck
-rw-r--r--ChangeLog.pre-git-import (renamed from doc/ChangeLog.pre-git-import)0
-rw-r--r--build/autotools/Makefile.am.changelog3
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/ChangeLog.pre-git-import b/ChangeLog.pre-git-import
index 8a2962581..8a2962581 100644
--- a/doc/ChangeLog.pre-git-import
+++ b/ChangeLog.pre-git-import
diff --git a/build/autotools/Makefile.am.changelog b/build/autotools/Makefile.am.changelog
index e0e001273..ca1ebc458 100644
--- a/build/autotools/Makefile.am.changelog
+++ b/build/autotools/Makefile.am.changelog
@@ -19,7 +19,6 @@ CHANGELOGS = ChangeLog \
CLEANFILES += $(srcdir)/ChangeLog.cache-*
changelogs:
- @cp -f $(top_srcdir)/doc/ChangeLog.pre-git-import $(srcdir)
@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
dist-hook: changelogs
@@ -46,7 +45,7 @@ $(srcdir)/ChangeLog:
echo A git checkout is required to generate this file >> $@); \
fi
-DISTCLEANFILES += ChangeLog.cache-* ChangeLog.pre-git-import
+DISTCLEANFILES += ChangeLog.cache-*
ChangeLog.cache-*..: .git