From 3a31e5f87a66e882f8e44281b96b35e120b10e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 2 Apr 2009 14:36:16 +0000
Subject: [PATCH] Zwischenstand

---
 configure.in              |  5 +++--
 doc/makefile.am           | 20 ++++++++++----------
 src/{ => xml-cxx}/xml.hxx |  0
 3 files changed, 13 insertions(+), 12 deletions(-)
 rename src/{ => xml-cxx}/xml.hxx (100%)

diff --git a/configure.in b/configure.in
index 931dd07..c8aed01 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,14 @@
 # init
 AC_INIT([README])
-PACKAGENAME=libxml-cxx
 SRC_DIR=src
 TST_DIR=test
 DOC_DIR=doc
 
+m4_define(x_packagename, libxml-cxx)
 m4_define(x_major, 0)
 m4_define(x_minor, 0)
 m4_define(x_least, 0)
-AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
+AM_INIT_AUTOMAKE(x_packagename, x_major.x_minor.x_least, [marc@waeckerlin.org])
 
 # files to create
 AC_CONFIG_FILES(makefile
@@ -16,6 +16,7 @@ AC_CONFIG_FILES(makefile
                 doc/doxyfile doc/makefile)
 
 # copy M4 to shell
+PACKAGENAME=x_packagename
 MAJOR=x_major
 MINOR=x_minor
 LEAST=x_least
diff --git a/doc/makefile.am b/doc/makefile.am
index d3a5ae3..96204bc 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -5,8 +5,8 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-#develdir = ${pkgdatadir}/doc/devel
-#devel_DATA = devel/index.html
+develdir = ${pkgdatadir}/doc/
+devel_DATA = html/index.html
 
 ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/test/*.[ch]xx
 
@@ -35,13 +35,13 @@ MAINTAINERCLEANFILES = makefile.in
 distclean-local:
 	- rm -r html latex
 
-#dist-hook:
-#	cp html/* ${develdir}
+dist-hook:
+	cp html/* ${develdir}
 
-#install-data-hook:
-#	chmod -R u+w ${pkgdatadir}/doc
-#	cp devel/* ${develdir}
+install-data-hook:
+	chmod -R u+w ${develdir}
+	cp html/* ${develdir}
 
-#uninstall-hook:
-#	chmod -R u+w ${pkgdatadir}/doc
-#	rm -rf ${develdir}
+uninstall-hook:
+	chmod -R u+w ${develdir}
+	rm -rf ${develdir}
diff --git a/src/xml.hxx b/src/xml-cxx/xml.hxx
similarity index 100%
rename from src/xml.hxx
rename to src/xml-cxx/xml.hxx