diff options
author | Dan McGee <dan@archlinux.org> | 2008-02-05 19:31:23 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-02-05 19:31:23 -0600 |
commit | eca30ed66accd7c1555eb94cbdea60051efcf7f3 (patch) | |
tree | 3ec7f3387dea753bb68968c66597a1aa8e091ab4 /Makefile.am | |
parent | 93a3050ed9e9735352013014da52adcdf896f95f (diff) | |
parent | b29838c8250125a22016c16180e941d059d55539 (diff) | |
download | pacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.xz |
Merge branch 'maint'
Conflicts:
contrib/gensync
contrib/updatesync
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
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 |