pidgin/pidgin

Merge the dist-clean fixes
release-2.x.y
2016-06-18, Gary Kramlich
6207e7f9548b
Parents 3ce95eee429d79270e3f0691
Children d02df09288d1
Merge the dist-clean fixes
2 files changed, 9 insertions(+), 0 deletions(-)
  • +4 -0
    .hgignore
  • +5 -0
    share/ca-certs/Makefile.am
    • --- a/.hgignore Sat Jun 18 19:12:22 2016 -0500
    +++ b/.hgignore Sat Jun 18 20:07:20 2016 -0500
    @@ -1,6 +1,7 @@
    syntax: regexp
    (.*/)?TAGS$
    (.*/)?\.svn
    +.*.swp
    .*/?.*\.pc$
    .*/?Makefile(\.in)?$
    .*/?Makefile\.am\.mingw$
    @@ -117,3 +118,6 @@
    stamp-h1
    test-driver
    win32-install-dir(\.release)?
    +share/ca-certs/cacert.pem
    +share/ca-certs/certdata.txt
    +
    --- a/share/ca-certs/Makefile.am Sat Jun 18 19:12:22 2016 -0500
    +++ b/share/ca-certs/Makefile.am Sat Jun 18 20:07:20 2016 -0500
    @@ -30,3 +30,8 @@
    .PHONY: mozilla.pem
    mozilla.pem: mk-ca-bundle.pl
    ./mk-ca-bundle.pl -u mozilla.pem
    +
    +CLEANFILES = \
    + certdata.txt \
    + mozilla.pem
    +