talons

commit af430eef5388fab3fe445afbabf047a8ba6a0613
parent a2cda5427e23b3df2d86ab82a84d40797bd35d59
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Thu, 19 Nov 2009 17:00:45 +0000

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
Makefile.am
 | 
11
++++++++---
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-

4 files changed, 16 insertions(+), 4 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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=