2012-10-10 [colin] 3.8.1cvs89

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a91fed0770d6196436795ebaf8ac184d16d6af76..f432ee9da4b1b16b417543782231769379cb3475 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_DIST = \
        claws-mail.pc.in \
        claws-mail.desktop \
        claws-mail.png \
-       autogen.sh
+       autogen.sh \
+       claws-features.h.in
 
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
@@ -26,20 +27,26 @@ pixmap64_DATA=claws-mail-64x64.png
 pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
 pixmap128_DATA=claws-mail-128x128.png
 
+# when changing the name or location of the .desktop file,
+# also update src/common/Makefile.am
 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 +61,7 @@ update-icon-cache:
 else
 
 install-data-hook: rename-icons
+uninstall-hook: remove-icons
 
 endif
 
@@ -62,7 +70,7 @@ pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
 clawsinclude_HEADERS = \
-       config.h
+       claws-features.h
 
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES