2009-09-10 [mones] 3.7.2cvs30

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index adf627e5f43e031cf4e101a867934b145a63db2d..2e0e5d4618dbbc9f46e31c953dd279ff7cca6bd8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-if PLATFORM_WIN32
-tools = 
-else
-tools = tools
-endif
-
-SUBDIRS = m4 po src $(tools) config doc manual
+SUBDIRS = m4 po src tools config doc manual
 
 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \
+       ChangeLog.pre2.0.0 \
+       ChangeLog.2.0.0-3.0.0 \
        RELEASE_NOTES \
        claws-mail-128x128.png \
        claws-mail-64x64.png \
@@ -20,16 +16,19 @@ EXTRA_DIST = \
        claws-mail.png \
        autogen.sh
 
-if CLAWS_GNOME2
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA=claws-mail.png
 gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
 
+if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
        @-if test -z "$(DESTDIR)"; then                                 \
                 echo "Updating Gtk icon cache.";                       \
                 $(gtk_update_icon_cache);                              \
@@ -39,19 +38,6 @@ install-data-hook:
                 echo "***   $(gtk_update_icon_cache)";                 \
                echo "***";                                             \
         fi
-
-else
-if CLAWS_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=claws-mail.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=claws-mail.desktop
-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=
-endif
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -60,3 +46,6 @@ pkgconfig_DATA = claws-mail.pc
 clawsincludedir = $(pkgincludedir)
 clawsinclude_HEADERS = \
        config.h
+
+relnotesdir = $(docdir)
+relnotes_DATA = RELEASE_NOTES