summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2013-02-23 20:40:34 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2013-02-23 20:40:34 +0100
commite14ffd8c3c261fc8ea8e2cedbb5adf5ea9b16fed (patch)
tree05a8b394a95cc6115c94cc0f0a7d837317f11155
parent4d894f48a93a550eaf74b7aaa852970dd11ee059 (diff)
downloadmdk-e14ffd8c3c261fc8ea8e2cedbb5adf5ea9b16fed.tar.gz
mdk-e14ffd8c3c261fc8ea8e2cedbb5adf5ea9b16fed.tar.bz2
Generating ChangeLog during make dist
-rw-r--r--.gitignore1
-rw-r--r--[-rwxr-xr-x]ChangeLog (renamed from etc/gitlog-to-changelog)0
-rw-r--r--Makefile.am5
-rwxr-xr-xautogen.sh6
-rw-r--r--samples/Makefile.am5
5 files changed, 6 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index a82084b..c62c122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
/ABOUT-NLS
-/ChangeLog
/Makefile
/Makefile.in
/aclocal.m4
diff --git a/etc/gitlog-to-changelog b/ChangeLog
index 38c6f3a..38c6f3a 100755..100644
--- a/etc/gitlog-to-changelog
+++ b/ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 0e4eb97..87f8adb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2004, 2006, 2013 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -19,6 +19,9 @@ distclean-local:
rm -f intltool-merge
rm -f intltool-update
+dist-hook:
+ $(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog
+
docdir = $(top_builddir)/doc
ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index 16091b5..9e6da0a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,12 +12,6 @@ FILE=mixlib
DIE=0
-echo "Generating ChangeLog..."
-touch ChangeLog
-(./etc/gitlog-to-changelog > ChangeLog) || {
- echo "Error generating ChangeLog. The file won't be up to date."
-}
-
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 19c9c27..357b5f3 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2004, 2006, 2013 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -14,5 +14,4 @@ SUBDIRS = tests
EXTRA_DIST = primes.result hello.mixal primes.mixal echo.mixal \
permutations.mixal permutations.cardrd isains.mixal \
- elevator.mixal mistery.mixal
-
+ elevator.mixal mystery.mixal