2009-11-19 [pawel] 3.7.3cvs18

	* Makefile.am
		complete 3.7.3cvs15 so install is DESTDIR safe
		remove icons with changed names on uninstall

diff --git a/ChangeLog b/ChangeLog
index f048ad73da9aefc7f2d047e2d3c0f5ec5f2d8730..cb4b6b0c211e2ccf3946324fd17706dbbb2f4986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-19 [pawel]     3.7.3cvs18
+
+       * Makefile.am
+               complete 3.7.3cvs15 so install is DESTDIR safe
+               remove icons with changed names on uninstall
+
 2009-11-18 [pawel]     3.7.3cvs17
 
        * src/news_gtk.c

diff --git a/Makefile.am b/Makefile.am
index a91fed0770d6196436795ebaf8ac184d16d6af76..fb75299006813b37d03e522d099a6e807bfa84ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,16 +30,20 @@ gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
 
 rename-icons:
-       @cd $(datadir)/icons/hicolor/64x64/apps && \
+       @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \
             mv claws-mail-64x64.png claws-mail.png
-       @cd $(datadir)/icons/hicolor/128x128/apps && \
+       @cd $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps && \
             mv claws-mail-128x128.png claws-mail.png
 
+remove-icons:
+       rm -f $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/claws-mail.png
+       rm -f $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/claws-mail.png
+
 if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: rename-icons update-icon-cache
-uninstall-hook: update-icon-cache
+uninstall-hook: remove-icons update-icon-cache
 
 update-icon-cache:
        @-if test -z "$(DESTDIR)"; then                                 \
@@ -54,6 +58,7 @@ update-icon-cache:
 else
 
 install-data-hook: rename-icons
+uninstall-hook: remove-icons
 
 endif
 

diff --git a/PATCHSETS b/PATCHSETS
index afabc4def2843500751b773b01275d0a1f1cc82d..87a2043cc4621204aef3ba567a967eb262a649ed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3891,3 +3891,4 @@
 ( cvs diff -u -r 1.24.2.26 -r 1.24.2.27 Makefile.am;  ) > 3.7.3cvs15.patchset
 ( cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/news_gtk.c;  ) > 3.7.3cvs16.patchset
 ( cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/news_gtk.c;  ) > 3.7.3cvs17.patchset
+( cvs diff -u -r 1.24.2.27 -r 1.24.2.28 Makefile.am;  ) > 3.7.3cvs18.patchset

diff --git a/configure.ac b/configure.ac
index a52e25ce5877d5c0356fd8b90029b332c529a268..009320f45e21162b2bd1817c4b47c4f996fce175 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=