2007-11-22 [wwp] 3.1.0cvs19

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 579c04dbfb54601b0445220a2c0ec234c20b8915..d317e28a41439cec3504430e8eedad1e04103b7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,45 +12,43 @@ 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 \
-       sylpheed-claws-128x128.png \
-       sylpheed-claws-64x64.png \
-       sylpheed-claws.pc.in \
-       sylpheed-claws.desktop \
-       sylpheed-claws.png \
+       claws-mail-128x128.png \
+       claws-mail-64x64.png \
+       claws-mail.pc.in \
+       claws-mail.desktop \
+       claws-mail.png \
        autogen.sh
 
-if SYLPHEED_GNOME2
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
-pixmap_DATA=sylpheed-claws.png
+pixmap_DATA=claws-mail.png
 gnomapdir = $(datadir)/applications
-gnomap_DATA=sylpheed-claws.desktop
-else
-if SYLPHEED_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=sylpheed-claws.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=sylpheed-claws.desktop
-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=
-endif
+gnomap_DATA=claws-mail.desktop
+
+if CLAWS_GNOME2
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+       @-if test -z "$(DESTDIR)"; then                                 \
+                echo "Updating Gtk icon cache.";                       \
+                $(gtk_update_icon_cache);                              \
+        else                                                           \
+                echo "*** Icon cache not updated. Remember to run:";   \
+               echo "***";                                             \
+                echo "***   $(gtk_update_icon_cache)";                 \
+               echo "***";                                             \
+        fi
 endif
 
-BZIP2_ENV =
-
-release: distdir
-       -chmod -R a+r $(distdir)
-       GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) chozf $(distdir).tar.gz $(distdir)
-       BZIP2=$(BZIP2_ENV) $(AMTAR)$(TAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
-       -rm -rf $(distdir)
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = sylpheed-claws.pc
+pkgconfig_DATA = claws-mail.pc
 
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
        config.h
+
+relnotesdir = $(docdir)
+relnotes_DATA = RELEASE_NOTES