2012-06-30 [paul] 3.8.1cvs1

	* Makefile.am
		fix bug 2579, 'Installed headers redefine autotools-specific constants'

diff --git a/ChangeLog b/ChangeLog
index bf93772a4c71ce1201fb6ca78d0d256671755d9e..ff3bcdde413664f84d988ba6255fcd72e54da541 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-30 [paul]      3.8.1cvs1
+
+       * Makefile.am
+               fix bug 2579, 'Installed headers redefine autotools-specific constants'
+
 2012-06-27 [paul]      3.8.1
        * NEWS
        * README

diff --git a/Makefile.am b/Makefile.am
index 043f6d5ab70ef4e41245f4d79de6fc520cc8730e..fa9657d188616eae413c2ad9821162beb878859c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,8 +68,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
-clawsinclude_HEADERS = \
-       config.h
 
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES

diff --git a/PATCHSETS b/PATCHSETS
index 8a3ac560ec310ef3b1f59d59ccffc17c906dd666..0c87250c8b7d69d014c96a64c705c9850dcb0039 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4375,3 +4375,4 @@
 ( cvs diff -u -r 1.213.2.207 -r 1.213.2.208 src/folder.c;  ) > 3.8.0cvs56.patchset
 ( cvs diff -u -r 1.654.2.4451 -r 1.654.2.4452 configure.ac;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 po/cs.po;  cvs diff -u -r 1.58.2.49 -r 1.58.2.50 po/de.po;  cvs diff -u -r 1.60.2.64 -r 1.60.2.65 po/es.po;  cvs diff -u -r 1.42.2.57 -r 1.42.2.58 po/fr.po;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 po/hu.po;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 po/id_ID.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/lt.po;  cvs diff -u -r 1.50.2.43 -r 1.50.2.44 po/pt_BR.po;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 po/sk.po;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 po/sv.po;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 po/zh_CN.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/zh_TW.po;  cvs diff -u -r 1.1.2.78 -r 1.1.2.79 src/gtk/authors.h;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 tools/claws.i18n.status.pl;  ) > 3.8.0cvs57.patchset
 ( cvs diff -u -r 1.654.2.4452 -r 1.654.2.4453 configure.ac;  ) > 3.8.0cvs58.patchset
+( cvs diff -u -r 1.24.2.29 -r 1.24.2.30 Makefile.am;  ) > 3.8.1cvs1.patchset

diff --git a/configure.ac b/configure.ac
index ca75eafce0e3f03b09feee5bc6d8b009b3240121..8dc1b9e7f1a53e0cd7d6441f171366c4f5be6422 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=