X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=Makefile.am;h=869f684c33e082267b4927357bd7d2f09b0bfcc2;hp=eeaf8f394e700fa791febf1a144e6929efdd8423;hb=cb4a9182f099de12e459ff44e76796dd6250d587;hpb=0ea5c4e273ee2f7f44bc8d5d57226bcf6f3c2968

diff --git a/Makefile.am b/Makefile.am
index eeaf8f394..869f684c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,25 @@
-SUBDIRS = ac po intl libkcc src manual tools
+SUBDIRS = ac 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) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	BZIP2=$(BZIP2_ENV) $(TAR) 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