Imported Debian patch 0.60.1-1

[hcoop/debian/courier-authlib.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fe51b79..d4a7d38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,8 @@
-# $Id: Makefile.am,v 1.116 2007/04/01 00:13:35 mrsam Exp $
+# $Id: Makefile.am,v 1.123 2007/10/07 02:50:45 mrsam Exp $
 #
-# Copyright 1998 - 2006 Double Precision, Inc.  See COPYING for
+# Copyright 1998 - 2007 Double Precision, Inc.  See COPYING for
 # distribution information.
 
-AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/automake.fix @AUTOMAKE@
 AUTOMAKE_OPTIONS=dist-bzip2
 
 SUBDIRS=@LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
@@ -288,7 +287,7 @@ EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
        checkpasswordmd5.c checkpasswordsha1.c \
        authldaprc authmysqlrc authpgsqlrc README.ldap \
        README.authmysql.myownquery \
-       README.authdebug.html.in automake.fix \
+       README.authdebug.html.in \
        courier-authlib.spec \
        courier-authlib.lpspec pgpkeys.txt \
        README_authlib.html.in \
@@ -302,16 +301,16 @@ EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
        auth_getuserinfo.html auth_getuserinfo.3 \
        auth_enumerate.html auth_enumerate.3 \
        auth_getoption.html auth_getoption.3 \
-       samplepipe.pl prep.xsl
+       samplepipe.pl
 
 README: README.html
-       links -dump README.html >README
+       links -dump -no-references README.html >README
 
 NEWS: NEWS.html
-       links -dump NEWS.html >NEWS
+       links -dump -no-references NEWS.html >NEWS
 
 INSTALL: INSTALL.html
-       links -dump INSTALL.html >INSTALL
+       rm -f INSTALL; links -dump -no-references INSTALL.html >INSTALL
 
 libcourierauthsasl_la_SOURCES=\
        authsasl.c courierauthsasl.h \
@@ -608,7 +607,7 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
        RELEASE=`expr $$NEXT_RELEASE + 1`; \
        echo "VERSION=@VERSION@" >$(srcdir)/rpm.release; \
        echo "RELEASE=$$RELEASE" >>$(srcdir)/rpm.release; \
-       sed 's/^Release: .*/Release: '$$RELEASE'%{courier_release}/' \
+       sed 's/^Release: .*/Release: '$$RELEASE'%{?dist}%{?courier_release}/' \
                <@PACKAGE@.spec >@PACKAGE@.spec.new; \
        mv @PACKAGE@.spec.new @PACKAGE@.spec; \
        sed 's/^Release: .*/Release: '$$RELEASE'/' \
@@ -617,7 +616,7 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
 
 upload-beta:
        rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
-       socksify ssh courier.sourceforge.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>/home/groups/c/co/courier/@PACKAGE@.beta
+       socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta
        ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@-dev && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
        scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@-dev/@PACKAGE@-@VERSION@
 
@@ -636,10 +635,10 @@ release-dist:
        emacs releasenotes.txt
        test -f releasenotes.txt || exit 1
        socksify ../sftools/release.pl mrsam $(SFPASSWD) courier authlib @VERSION@ releasenotes.txt changelog.txt @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
-       socksify ssh courier.sourceforge.net rm -f /home/groups/c/co/courier/@PACKAGE@.beta
+       socksify ssh grace.speakeasy.net rm -f courier-mta.org/@PACKAGE@.beta
 
 HTMLDOCFILES=$(HTMLFILES) README.authdebug.html README_authlib.html \
        $(man3:%.3=%.html) $(man1:%.1=%.html)
 
 htmldoc: $(HTMLDOCFILES)
-       for f in $^; do d=`basename $$f`; test "$$d" = "README.html" && d="index2.html"; xsltproc --nonet $(srcdir)/prep.xsl $$f | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >html/$$d; done
+       for f in $^; do d=`basename $$f`; test "$$d" = "README.html" && d="index2.html"; xsltproc --nonet $$HOME/www/www.courier-mta.org/xsl/authlib.xsl $$f | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >html/$$d; done