Merge branch 'master' of ssh://jpgarch@complete.org/~jpgarch/git/offlineimap

[offlineimap] / Makefile

diff --git a/Makefile b/Makefile
index e7f639c7385ea1ab2c1a0787ba29c6eaf6cdb856..3e5e537d15e8bd74be781d35eb85f04967ef3b44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002 - 2006 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -15,12 +15,12 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-VERSION=4.0.13
+VERSION=4.0.16
 TARGZ=offlineimap_$(VERSION).tar.gz
 SHELL=/bin/bash
 
 clean:
-       -python2.3 setup.py clean --all
+       -python setup.py clean --all
        -rm -f `find . -name "*~"`
        -rm -f `find . -name "*.tmp"`
        -rm -f bin/offlineimapc
@@ -31,8 +31,9 @@ clean:
        -rm -f `find . -name ".cache*"`
        -rm -f manpage.links manpage.refs
        -find . -name auth -exec rm -vf {}/password {}/username \;
+       -rm -f manual.html manual.pdf manual.txt manual.ps offlineimap.1
 
-doc:
+doc: 
        docbook2man offlineimap.sgml
        docbook2man offlineimap.sgml
        docbook2html -u offlineimap.sgml
@@ -42,13 +43,16 @@ doc:
        groff -Tascii -man offlineimap.1 | sed $$'s/.\b//g' > manual.txt
        -rm manpage.links manpage.refs manual.ps
 
+faq:
+       curl -o FAQ.html http://software.complete.org/offlineimap/wiki/FrequentlyAskedQuestions
+
 targz: ../$(TARGZ)
 ../$(TARGZ):
        if ! pwd | grep -q "/offlineimap-$(VERSION)$$"; then                    \
          echo "Containing directory must be called offlineimap-$(VERSION)";    \
          exit 1;                                                               \
        fi;                                                                     \
-       pwd && cd .. && pwd && tar -zhcv --exclude '_darcs' -f $(TARGZ) offlineimap-$(VERSION)
+       pwd && cd .. && pwd && tar -zhcv --exclude '.git' -f $(TARGZ) offlineimap-$(VERSION)
 
 rpm: targz
        cd .. && sudo rpmbuild -ta $(TARGZ)