- more autotool magic in documentation files

- including substituted documentation files with distributed files


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@597 96b47cad-a561-4643-ad3b-153ac7d7599c

npa/Makefile.am

@@ -21,9 +21,6 @@ win:
 	    ./configure --disable-doc && \
 	    env OPENSSL_VERSION="1" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh
 
-doc :
-	$(MAKE) doc -C $(srcdir)/doc
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnpa.pc
 libnpa.pc:

npa/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([npa], [0.4], [http://sourceforge.net/projects/vsmartcard/support])
+AC_INIT([nPA smart card library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/])
 AC_CONFIG_SRCDIR([src/npa.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

npa/doc/Makefile.am

@@ -1,5 +1,8 @@
 do_subst = sed \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
+	   -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \
+	   -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
+	   -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
 	   -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
 	   -e 's,[@]builddir[@],$(builddir),g' \
 	   -e 's,[@]prefix[@],$(prefix),g' \
@@ -10,7 +13,7 @@ do_subst = sed \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
-EXTRA_DIST = README.rst Doxyfile.in example.c autotools.rst.in questions.rst.in
+EXTRA_DIST = README.rst Doxyfile.in example.c autotools.rst autotools.rst.in questions.rst questions.rst.in
 
 .PHONY: doc
 doc:
@@ -19,6 +22,3 @@ doc:
 	touch api.rst
 	$(do_subst) < autotools.rst.in > autotools.rst
 	$(do_subst) < questions.rst.in > questions.rst
-
-clean-local:
-	rm -f Doxyfile autotools.rst questions.rst