2.0.0-rc2.

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 335892e0db916dc9fbea8e6e9f61849d6e182028..af8fad31437905a2490c99409ad7207f3a0cb707 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,41 @@
 SUBDIRS = m4 po src tools config doc
 
 EXTRA_DIST = \
-       ChangeLog.claws \
-       ChangeLog-gtk2.claws \
-       ChangeLog-gtk2.jp \
-       README.claws \
-       sylpheed-128x128.png \
-       sylpheed-64x64.png \
+       ChangeLog \
+       ChangeLog.gtk1 \
+       RELEASE_NOTES \
+       sylpheed-claws-128x128.png \
+       sylpheed-claws-64x64.png \
        sylpheed-claws.pc.in \
-       sylpheed.desktop \
-       sylpheed.png \
-       sylpheed.spec \
-       sylpheed.spec.in \
-       TODO-gtk2 \
-       TODO-gtk2.jp \
-       autogen.sh 
+       sylpheed-claws.desktop \
+       sylpheed-claws.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
+gnomapdir = $(datadir)/applications
+gnomap_DATA=sylpheed-claws.desktop
+else
 if SYLPHEED_GNOME
 pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=sylpheed.png
+pixmap_DATA=sylpheed-claws.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=sylpheed.desktop
+gnomap_DATA=sylpheed-claws.desktop
 else
 pixmapdir=
 pixmap_DATA=
 gnomapdir=
 gnomap_DATA=
 endif
+endif
 
 BZIP2_ENV =
 
 release: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -f $(distdir)/sylpheed.spec
-       sed '/^Source:/s/\.tar\.gz$$/\.tar\.bz2/' sylpheed.spec \
-         > $(distdir)/sylpheed.spec
        BZIP2=$(BZIP2_ENV) $(AMTAR)$(TAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
        -rm -rf $(distdir)