[pkg-opensc-commit] [pkcs11-helper] 82/253: Add --with-apidocdir

[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 ee258e8148bef7e0b768c985d32fb9f3b5e4c6a0
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Wed Feb 14 20:06:00 2007 +0000

    Add --with-apidocdir
---
 Makefile.am         |  2 +-
 configure.ac        | 11 +++++++----
 doc/api/Makefile.am |  3 +--
 man/Makefile.am     |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index afb75a5..a57fa66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ AUTOMAKE_OPTIONS=foreign dist-bzip2
 
 SUBDIRS=man include lib m4dir doc distro tests
 
-dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
+dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
 
 EXTRA_DIST=config-w32-vc.h
 
diff --git a/configure.ac b/configure.ac
index e28ca0e..fe3a129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,12 @@ AC_ARG_ENABLE([pedantic],
 	[enable_pedantic="no"]
 )
 
+AC_ARG_WITH([apidocdir],
+	[  --with-apidocdir                  Put API documents at this directory, default HTMLDIR\api],
+	[apidocdir="${with_apidocdir}"],
+	[apidocdir="\$(htmldir)/api"]
+)
+
 AC_ARG_WITH([crypto-engine-openssl],
 	[  --without-crypto-engine-openssl   Disable OpenSSL crypto engine],
 	,
@@ -361,11 +367,8 @@ else
     AC_DEFINE([P_Z], ["%zu"], [size_t printf format])
 fi
 
-mydocdir="\$(docdir)-\$(PACKAGE_VERSION)"
-myhtmldir="\$(htmldir)-\$(PACKAGE_VERSION)"
 pkgconfigdir="\$(libdir)/pkgconfig"
-AC_SUBST([mydocdir])
-AC_SUBST([myhtmldir])
+AC_SUBST([apidocdir])
 AC_SUBST([pkgconfigdir])
 AC_SUBST([PKCS11H_FEATURES])
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 18a344c..0164271 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -53,8 +53,7 @@ EXTRA_DIST=Doxyfile Doxyfile_footer.html *.gif
 
 if ENABLE_DOC
 
-apidir=$(myhtmldir)/api
-api_DATA=api.out/html/*
+apidoc_DATA=api.out/html/*
 
 api.out/html/*: \
 		$(EXTRA_DIST) \
diff --git a/man/Makefile.am b/man/Makefile.am
index 5af0355..b712f90 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -56,7 +56,7 @@ if WIN32
 %.3.html:
 	$(MAN2HTML) < $*.3 > $@
 	
-nodist_myhtml_DATA=$(shell ls *.[0-9] | sed -r 's/(\.[0-9])/\1.html/g')
+nodist_html_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