sync with main 0.9.11cvs1

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d78024e9867fb05f0881b9a716e3f7e69b08942a..b24fb26a6f2c83959ca735eca2506660da69b808 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,25 @@
-SUBDIRS = ac po intl libkcc src manual tools
+SUBDIRS = m4 po src tools config intl doc
 
 EXTRA_DIST = \
+       ChangeLog.claws \
        ChangeLog.jp \
-       INSTALL.jp \
-       README.jp \
        README.claws \
-       TODO.jp \
+       README.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 \
+       TODO.claws \
+       TODO.jp
 
 if SYLPHEED_GNOME
-pixmapdir=$(gnomedir)/share/pixmaps
+pixmapdir=$(gnomedatadir)/pixmaps
 pixmap_DATA=sylpheed.png
-gnomapdir=$(gnomedir)/share/gnome/apps/Internet
+gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=sylpheed.desktop
 else
 pixmapdir=
@@ -29,6 +32,16 @@ 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