aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am10
-rw-r--r--modules/pam_unix/Makefile.am2
2 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 60674d24..8a2e31dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ endif
CLEANFILES = *~
-EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright
+EXTRA_DIST = pgp.keys.asc Copyright
ACLOCAL_AMFLAGS = -I m4
@@ -40,11 +40,9 @@ xtests:
gen_changelog_start_date = 2011-10-26
gen-ChangeLog:
if test -d .git; then \
- ( $(top_srcdir)/gitlog-to-changelog --append-dot \
- --since=$(gen_changelog_start_date) && \
- echo && echo && \
- echo 'See ChangeLog-CVS for earlier changes.' \
- ) > $(distdir)/ChangeLog.new && \
+ $(top_srcdir)/gitlog-to-changelog --append-dot \
+ --since=$(gen_changelog_start_date) \
+ > $(distdir)/ChangeLog.new && \
rm -f $(distdir)/ChangeLog && \
mv $(distdir)/ChangeLog.new $(distdir)/ChangeLog; \
fi
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index a78cbf5b..44f8b24e 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -5,7 +5,7 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = $(MANS) README
-EXTRA_DIST = md5.c md5_crypt.c lckpwdf.-c yppasswd_xdr.c $(XMLS) CHANGELOG
+EXTRA_DIST = md5.c md5_crypt.c lckpwdf.-c yppasswd_xdr.c $(XMLS)
if HAVE_DOC
dist_man_MANS = pam_unix.8 unix_chkpwd.8