[vhffs-dev] [1438] woops, I forgot there was config samples in doc directory

[subversion@xxxxxxxxxxxxx]

Revision: 1438
Author:   beuss
Date:     2009-06-14 16:15:44 +0200 (Sun, 14 Jun 2009)

Log Message:
-----------
woops, I forgot there was config samples in doc directory

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac
    trunk/vhffs-doc/Makefile.am

Added Paths:
-----------
    trunk/vhffs-doc/


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-06-14 13:36:50 UTC (rev 1437)
+++ trunk/Makefile.am	2009-06-14 14:15:44 UTC (rev 1438)
@@ -8,7 +8,7 @@
   SUB_VHFFS_FS=vhffs-fs
 endif
 
-SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
+SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
 	vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-themes vhffs-tools
 
 EXTRA_DIST = config.rpath m4/ChangeLog vhffs-forum vhffs-irc

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-06-14 13:36:50 UTC (rev 1437)
+++ trunk/configure.ac	2009-06-14 14:15:44 UTC (rev 1438)
@@ -54,6 +54,15 @@
 )
 AC_SUBST(TOOLSDIR)
 
+dnl Documentation
+AC_ARG_WITH(doc-path,
+	AC_HELP_STRING([--with-doc-path=path],
+		[Complete path for documentation files (/usr/share/doc/vhffs)]),
+	DOCDIR=$withval,
+	DOCDIR=${prefix}/share/doc/vhffs
+)
+AC_SUBST(DOCDIR)
+
 dnl perl modules
 AC_ARG_WITH(api-path,
     AC_HELP_STRING([--with-api-path=path],
@@ -127,6 +136,15 @@
 )
 AC_SUBST(LEDIR)
 
+dnl documentation
+AC_ARG_WITH(doc-path,
+	AC_HELP_STRING([--with-doc-path=path],
+		[Complete path for documentation files (/usr/share/doc/vhffs)]),
+	DOCSDIR=$withval,
+	DOCSDIR=${prefix}/share/doc/vhffs
+)
+AC_SUBST(DOCSDIR)
+
 dnl Compatibility stuff
 
 AC_ARG_WITH(compat-path,
@@ -137,7 +155,6 @@
 )
 AC_SUBST(COMPATDIR)
 
-
 dnl setup min uid and gid
 AC_ARG_WITH(min-uid,
 	AC_HELP_STRING([--with-min-uid=uid],
@@ -157,7 +174,6 @@
 
 dnl Modular build (if someone wants to improve...)
 
-
 dnl Install panel or not ?
 AC_ARG_ENABLE(panel,
     AC_HELP_STRING([--enable-panel],
@@ -273,6 +289,7 @@
 	vhffs-backend/Makefile
 	vhffs-backend/src/Makefile
 	vhffs-compat/Makefile
+	vhffs-doc/Makefile
 	vhffs-jabber/Makefile
 	vhffs-listengine/Makefile
 	vhffs-listengine/src/Makefile

Copied: trunk/vhffs-doc (from rev 1428, trunk/vhffs-doc)


Property changes on: trunk/vhffs-doc
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am	2009-06-03 15:23:40 UTC (rev 1428)
+++ trunk/vhffs-doc/Makefile.am	2009-06-14 14:15:44 UTC (rev 1438)
@@ -2,16 +2,6 @@
 
 docdir = @DOCDIR@
 
-if BUILD_DOC
-VHFFS_DOC_EXTRADATA = html/fr/vhffs-doc.html
-VHFFS_DOC_SRC = src/%/vhffs-doc.xml \
-	src/%/part1/mydns.xml \
-	src/%/part1/mirror.xml \
-	src/%/part1/applis.xml \
-	src/%/part1/services.xml \
-	src/%/part1/exim.xml
-endif
-
 nobase_dist_doc_DATA = \
 	config/exim4-mx1/exim4.conf \
 	config/courier/pop3d \
@@ -22,11 +12,4 @@
 	config/courier/authpgsqlrc \
 	config/courier/authdaemonrc \
 	config/exim4-mx2/exim4.conf \
-	config/apache/panelconf $(VHFFS_DOC_EXTRADATA)
-
-html/%/vhffs-doc.html: $(VHFFS_DOC_SRC)
-	test -d $(@D) || $(mkdir_p) $(@D)
-	$(XSLTPROC) --xinclude --output $@ /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl $<
-
-clean-local:
-	rm -rf html
+	config/apache/panelconf