summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-06 02:31:23 +0100
committerDan McGee <dan@archlinux.org>2008-02-06 02:31:23 +0100
commiteca30ed66accd7c1555eb94cbdea60051efcf7f3 (patch)
tree3ec7f3387dea753bb68968c66597a1aa8e091ab4 /Makefile.am
parent93a3050ed9e9735352013014da52adcdf896f95f (diff)
parentb29838c8250125a22016c16180e941d059d55539 (diff)
downloadpacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.gz
pacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.xz
Merge branch 'maint'
Conflicts: contrib/gensync contrib/updatesync
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6453555e..dc085429 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = HACKING
# Sample makepkg prototype files
pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = PKGBUILD.proto proto.install
+dist_pkgdata_DATA = PKGBUILD.proto proto.install ChangeLog.proto
# run the pactest test suite
check-local: src/pacman