From 0744157470c8df9a804ca3a26312a6ff8063b728 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 13 Dec 2008 18:57:26 +0000 Subject: [PATCH] 2008-12-13 [colin] 3.6.1cvs74 * tools/Makefile.am Only install certs on windows --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- tools/Makefile.am | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 43b0d59ff..e42025301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-13 [colin] 3.6.1cvs74 + + * tools/Makefile.am + Only install certs on windows + 2008-12-13 [colin] 3.6.1cvs73 * tools/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 0176c8e1e..0e1f0ccab 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3655,3 +3655,4 @@ ( cvs diff -u -r 1.179.2.237 -r 1.179.2.238 src/imap.c; cvs diff -u -r 1.79.2.66 -r 1.79.2.67 src/mh.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/partial_download.c; cvs diff -u -r 1.96.2.211 -r 1.96.2.212 src/textview.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/claws.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/common/prefs.c; cvs diff -u -r 1.36.2.155 -r 1.36.2.156 src/common/utils.c; ) > 3.6.1cvs71.patchset ( cvs diff -u -r 1.654.2.3718 -r 1.654.2.3719 configure.ac; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/claws.def; ) > 3.6.1cvs72.patchset ( cvs diff -u -r 1.25.2.28 -r 1.25.2.29 tools/Makefile.am; diff -u /dev/null tools/ca-certificates.crt; cvs diff -u -r 1.24.2.18 -r 1.24.2.19 src/common/Makefile.am; cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/ssl.c; ) > 3.6.1cvs73.patchset +( cvs diff -u -r 1.25.2.29 -r 1.25.2.30 tools/Makefile.am; ) > 3.6.1cvs74.patchset diff --git a/configure.ac b/configure.ac index 97ad7c281..387799b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=73 +EXTRA_VERSION=74 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/tools/Makefile.am b/tools/Makefile.am index 1ec34e00e..575d5407a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -71,5 +71,7 @@ distclean-local: fi; \ fi +if PLATFORM_WIN32 install-data-local: cp ca-certificates.crt ${pkgdatadir} +endif -- 2.25.1