2005-10-06 [paul] 1.9.15cvs15

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 945e0e1912218fdea5f3561567f76847c459074c..338190f112993e7a2b86f6a2b64f3a9986057a6f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,38 @@
-SUBDIRS = ac po src man manual faq tools config intl
+SUBDIRS = m4 po src tools config doc
 
 EXTRA_DIST = \
        ChangeLog.claws \
-       ChangeLog.jp \
+       ChangeLog-gtk2.claws \
        README.claws \
-       README.jp \
-       sylpheed-128x128.png \
-       sylpheed-64x64.png \
+       RELEASE_NOTES.claws \
+       sylpheed-claws-128x128.png \
+       sylpheed-claws-64x64.png \
        sylpheed-claws.pc.in \
-       sylpheed.desktop \
-       sylpheed.png \
+       sylpheed-claws.desktop \
+       sylpheed-claws.png \
        sylpheed.spec \
        sylpheed.spec.in \
-       TODO \
-       TODO.claws \
-       TODO.jp \
-       autogen.sh 
+       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 =