2005-04-21 [paul] 1.9.6cvs45

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d78024e9867fb05f0881b9a716e3f7e69b08942a..e336f224401345c42c1bc86775cda47d022bb4fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,32 @@
-SUBDIRS = ac po intl libkcc src manual tools
+SUBDIRS = m4 po src tools config doc
 
 EXTRA_DIST = \
-       ChangeLog.jp \
-       INSTALL.jp \
-       README.jp \
+       ChangeLog.claws \
+       ChangeLog-gtk2.claws \
+       ChangeLog-gtk2.jp \
        README.claws \
-       TODO.jp \
+       sylpheed-128x128.png \
+       sylpheed-64x64.png \
+       sylpheed-claws.pc.in \
+       sylpheed.desktop \
+       sylpheed.png \
        sylpheed.spec \
        sylpheed.spec.in \
-       autogen.sh \
-       sylpheed.png \
-       sylpheed.desktop \
-       ChangeLog.claws
+       TODO-gtk2 \
+       TODO-gtk2.jp \
+       autogen.sh 
 
 if SYLPHEED_GNOME
-pixmapdir=$(gnomedir)/share/pixmaps
+pixmapdir=$(gnomedatadir)/pixmaps
+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=$(gnomedir)/share/gnome/apps/Internet
+gnomapdir = $(datadir)/applications
 gnomap_DATA=sylpheed.desktop
 else
 pixmapdir=
@@ -24,11 +34,22 @@ pixmap_DATA=
 gnomapdir=
 gnomap_DATA=
 endif
+endif
 
 BZIP2_ENV =
 
 release: distdir
        -chmod -R a+r $(distdir)
-       GZIP=$(GZIP_ENV) $(AMTAR) chozf $(distdir).tar.gz $(distdir)
-       BZIP2=$(BZIP2_ENV) $(AMTAR) chojf $(distdir).tar.bz2 $(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)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sylpheed-claws.pc
+
+sylpheedincludedir = $(pkgincludedir)
+sylpheedinclude_HEADERS = \
+       config.h