diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-07 20:20:45 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-07 20:20:45 -0500 |
| commit | f53c6b6069407a005b7911b5275761ff10c270cb (patch) | |
| tree | 920aa7e9ea775552f447e48d118e44b687bf3a72 | |
| parent | e58036978c7c9077fe90517cd9e3e3c8035ca1f2 (diff) | |
| parent | 257f7118e71ef4aa59bec55cd43bf1bdd228d152 (diff) | |
| download | xorg-proto-printproto-f53c6b6069407a005b7911b5275761ff10c270cb.tar.gz | |
Merge branch 'master' into XACE-SELINUXXACE-SELINUX
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 10 |
3 files changed, 11 insertions, 10 deletions
@@ -8,3 +8,4 @@ configure install-sh missing printproto.pc +*~ diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 03b1497..0000000 --- a/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - diff --git a/Makefile.am b/Makefile.am index 0ce1e0e..5492c79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = printproto.pc EXTRA_DIST = autogen.sh printproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog |