[pkg-opensc-commit] [pkcs11-helper] 62/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 3b06f9e6a78d29194a7b1c9532ab323b5822e373
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Tue Jan 9 10:04:32 2007 +0000

    autoconf dirs fixups
---
 configure.ac        | 6 ++++--
 doc/api/Makefile.am | 2 +-
 man/Makefile.am     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0048f2d..49d8733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,9 +357,11 @@ if test \
 	PKCS11H_FEATURES="${PKCS11H_FEATURES} engine_crypto"
 fi
 
-mydocdir="\${docdir}-${PACKAGE_VERSION}"
-pkgconfigdir="\${libdir}/pkgconfig"
+mydocdir="\$(docdir)-\$(PACKAGE_VERSION)"
+myhtmldir="\$(htmldir)-\$(PACKAGE_VERSION)"
+pkgconfigdir="\$(libdir)/pkgconfig"
 AC_SUBST([mydocdir])
+AC_SUBST([myhtmldir])
 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 055bb1c..387509e 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=$(mydocdir)/api
+apidir=$(myhtmldir)/api
 api_DATA=api.out/html/*
 
 api.out/html/*: \
diff --git a/man/Makefile.am b/man/Makefile.am
index 218af2b..a5f0fcb 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -56,7 +56,7 @@ if WIN32
 %.3.html:
 	$(MAN2HTML) < $*.3 > $@
 	
-nodist_html_DATA=$(shell ls *.[0-9] | sed -r 's/(\.[0-9])/\1.html/g')
+nodist_myhtml_DATA=$(shell ls *.[0-9] | sed -r 's/(\.[0-9])/\1.html/g')
 
 endif
 

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