2005-04-21 [paul] 1.9.6cvs45

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 97c77bd1d10e8bfe60466f52602b3cde9b0f3c20..e336f224401345c42c1bc86775cda47d022bb4fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
-SUBDIRS = ac po src man manual faq tools config
+SUBDIRS = m4 po src tools config doc
 
 EXTRA_DIST = \
        ChangeLog.claws \
-       ChangeLog.jp \
-       ChangeLog-gtk2 \
+       ChangeLog-gtk2.claws \
        ChangeLog-gtk2.jp \
        README.claws \
-       README.jp \
        sylpheed-128x128.png \
        sylpheed-64x64.png \
        sylpheed-claws.pc.in \
@@ -14,9 +12,6 @@ EXTRA_DIST = \
        sylpheed.png \
        sylpheed.spec \
        sylpheed.spec.in \
-       TODO \
-       TODO.claws \
-       TODO.jp \
        TODO-gtk2 \
        TODO-gtk2.jp \
        autogen.sh 
@@ -27,11 +22,19 @@ pixmap_DATA=sylpheed.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=sylpheed.desktop
 else
+if SYLPHEED_GNOME2
+# hicolor icon theme, base class of all icon themes
+pixmapdir=$(datadir)/icons/hicolor/48x48/apps
+pixmap_DATA=sylpheed.png
+gnomapdir = $(datadir)/applications
+gnomap_DATA=sylpheed.desktop
+else
 pixmapdir=
 pixmap_DATA=
 gnomapdir=
 gnomap_DATA=
 endif
+endif
 
 BZIP2_ENV =