[pkg-opensc-commit] [pkcs11-helper] 60/253: Autoconf dirs fixups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit e48dd1145f465596be3db54cf17ee92fd5ecdaaa
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Mon Jan 8 19:00:49 2007 +0000

    Autoconf dirs fixups
---
 ChangeLog           | 4 ++++
 Makefile.am         | 2 +-
 configure.ac        | 7 ++++---
 doc/api/Makefile.am | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79a2d2c..63c802a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@ Copyright (c) 2006 Alon Bar-Lev <alon.barlev at gmail.com>
 
 $Id$
 
+2007-??-?? - Version 1.03
+
+* Autoconf fixups.
+
 2007-10-05 - Version 1.02
 
 * Switch to free implementation of PKCS#11 headers.
diff --git a/Makefile.am b/Makefile.am
index 2c34ece..3dc0210 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ AUTOMAKE_OPTIONS=foreign dist-bzip2
 
 SUBDIRS=man include lib m4dir doc tests
 
-dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
+dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
 
 EXTRA_DIST=config-w32-vc.h pkcs11-helper.spec
 
diff --git a/configure.ac b/configure.ac
index 6fd0dba..0048f2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@
 #
 
 AC_PREREQ(2.60)
-AC_INIT(pkcs11-helper, 1.02)
+AC_INIT(pkcs11-helper, 1.03-beta1)
 AM_INIT_AUTOMAKE(pkcs11-helper, [$PACKAGE_VERSION])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([lib/common.h])
@@ -357,8 +357,9 @@ if test \
 	PKCS11H_FEATURES="${PKCS11H_FEATURES} engine_crypto"
 fi
 
-docdir="${docdir}-${PACKAGE_VERSION}"
-pkgconfigdir="${libdir}/pkgconfig"
+mydocdir="\${docdir}-${PACKAGE_VERSION}"
+pkgconfigdir="\${libdir}/pkgconfig"
+AC_SUBST([mydocdir])
 AC_SUBST([pkgconfigdir])
 AC_SUBST([PKCS11H_FEATURES])
 AM_CONDITIONAL(ENABLE_DOC, test "${ENABLE_DOC}" = "yes")
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index e8962fa..055bb1c 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST=Doxyfile Doxyfile_footer.html *.gif
 
 if ENABLE_DOC
 
-apidir=$(htmldir)/api
+apidir=$(mydocdir)/api
 api_DATA=api.out/html/*
 
 api.out/html/*: \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git