- 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

virtualsmartcard/Makefile.am

@@ -1,4 +1 @@
 SUBDIRS = src doc
-
-doc:
-	$(MAKE) doc -C $(srcdir)/doc

virtualsmartcard/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([virtualsmartcard], [0.5], [http://sourceforge.net/projects/vsmartcard/support])
+AC_INIT([Virtual Smart Card], [0.5], [http://sourceforge.net/projects/vsmartcard/support], [virtualsmartcard], [http://sourceforge.net/projects/vsmartcard/])
 AC_CONFIG_SRCDIR([src/vpcd/ifd-vpcd.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

virtualsmartcard/doc/Makefile.am

@@ -2,6 +2,9 @@ SUBDIRS = api
 
 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' \
@@ -12,7 +15,7 @@ do_subst = sed \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
-EXTRA_DIST = README.rst autotools.rst.in questions.rst.in
+EXTRA_DIST = README.rst autotools.rst.in questions.rst.in autotools.rst questions.rst
 
 dist_noinst_SCRIPTS = generate_modules.py
 
@@ -21,6 +24,3 @@ doc:
 	$(do_subst) < autotools.rst.in > autotools.rst
 	$(do_subst) < questions.rst.in > questions.rst
 	./generate_modules.py $(top_srcdir)/src/vpicc --dest-dir=api --suffix=rst --no-toc -1
-
-clean-local:
-	rm -rf api/* autotools.rst questions.rst