GNOME.org
 

[passepartout] moved the documentation to the desired place

commit c9ed815eb5438fbee58cfb504641a6be4740132e
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 23 13:11:50 2009 +0200

    moved the documentation to the desired place
    
    * configure.ac: updated the location of the version file
    * Makefile.am: added the help folder
    * doc/Makefile.am: dropped the help related stuff
    * doc/users_guide.pp: updated the location of the docbook stuff
    * doc/.gitignore -> help/.gitignore,
    * doc/faq.xml -> help/C/faq.xml,
    * doc/legal.xml -> help/C/legal.xml,
    * doc/manual.xml -> help/C/manual.xml,
    * doc/nsfaq.xml -> help/C/nsfaq.xml,
    * doc/users_guide.xml -> help/C/users_guide.xml,
    * doc/version.txt.in -> help/C/version.txt.in,
    * doc/Makefile.am -> help/Makefile.am,
    * docbook2html.xslt,
    * docbook2txt.xslt,
    * doc/passepartout-C.omf.in -> help/passepartout-C.omf.in: moved the
      documentation to the place where it belongs to (for gnome-doc-utils)
---
 Makefile.am                         |    1 +
 configure.ac                        |    6 ++-
 doc/Makefile.am                     |   72 +----------------------------------
 doc/users_guide.pp                  |    2 +-
 {doc => help}/.gitignore            |    0
 {doc => help/C}/faq.xml             |    0
 {doc => help/C}/legal.xml           |    0
 {doc => help/C}/manual.xml          |    0
 {doc => help/C}/nsfaq.xml           |    0
 {doc => help/C}/users_guide.xml     |    0
 {doc => help/C}/version.txt.in      |    0
 help/Makefile.am                    |   71 ++++++++++++++++++++++++++++++++++
 {doc => help}/docbook2html.xslt     |    0
 {doc => help}/docbook2txt.xslt      |    0
 {doc => help}/passepartout-C.omf.in |    0
 15 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 859b583..83adfee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS=\
 	data \
+	help \
        src \
        doc \
        logotype \
diff --git a/configure.ac b/configure.ac
index 61c379c..4e44ca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,8 +136,10 @@ if test "$SCROLLKEEPER_UPDATE" = "no"; then
 fi
 
 AC_CONFIG_FILES([doc/Makefile
-		 doc/version.txt
-		 doc/examples/Makefile])
+		 doc/examples/Makefile
+		 help/Makefile
+		 help/C/version.txt
+		 ])
 
 dnl  ------
 dnl | i18n |
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 41bdcf4..704055d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,76 +3,6 @@ SUBDIRS = examples
 #install docs in $(docdir)
 dist_doc_DATA = users_guide.pp \
 	../logotype/pptout-sv.eps README
-nodist_doc_DATA=\
-	manual.html \
-	manual.txt \
-	$(NULL)
-
-dist_help_DATA=\
-	faq.xml \
-	legal.xml \
-	nsfaq.xml \
-	manual.xml \
-	users_guide.xml \
-	$(top_srcdir)/logotype/pptout.png \
-	$(NULL)
-dist_built_in=version.txt.in
-nodist_help_DATA=$(dist_built_in:.in=)
-helpdir=$(datadir)/gnome/help/passepartout/C
-
-check-local: check-manual
-
-# FIXME: once we use docbook 5.0, make sure each <acronym> has an <alt>
-check-manual: manual.xml
-	@echo "[TEST] $<"
-	@$(XMLLINT) --xinclude $< | $(XMLLINT) --valid --noout -
-
-omf_in_files=passepartout-C.omf.in
-omf_DATA=$(omf_in_files:.in=)
-omfdir=$(datadir)/omf/passepartout
-
-passepartout-C.omf: passepartout-C.omf.in Makefile
-	@echo "[GEN]  $@"
-	@sed 's&@DATADIR@&$(datadir)&' $< > $@
-
-# Make symbolic links to the stylesheets:
-# (Remove existing stylesheets first; the -f flag for ln is not portable.)
-# Todo: is basename really portable?
-install-data-hook:
-	rm -f $(DESTDIR)/$(docdir)/*.xslt
-	for i in $(DESTDIR)/$(datadir)/xml/$(PACKAGE)/*.xslt; do \
-		ln -s $(datadir)/xml/$(PACKAGE)/`basename $$i` $(DESTDIR)/$(docdir); \
-	done
-	@if test -z "$(DESTDIR)"; then \
-		echo "$(SCROLLKEEPER_UPDATE)"; \
-		$(SCROLLKEEPER_UPDATE); \
-	else \
-		echo "******" >&2; \
-		echo "*** Don't forget to run \"$(SCROLLKEEPER_UPDATE)\"" >&2 ; \
-		echo "******" >&2; \
-	fi
-
-uninstall-hook:
-	rm -f $(DESTDIR)/$(docdir)/*.xslt
-	$(SCROLLKEEPER_UPDATE)
 
 # man pages
-man_MANS = passepartout.1x xml2ps.1
-
-# documentation stylesheets
-DOCBOOK2TXT = docbook2txt.xslt
-DOCBOOK2HTML = docbook2html.xslt
-
-SUFFIXES=.txt .xml .html
-
-.xml.txt:
-	@echo "[GEN]  $@"
-	@xsltproc -o $@ $(srcdir)/$(DOCBOOK2TXT) $<
-
-.xml.html:
-	@echo "[GEN]  $@"
-	@xsltproc -o $@ $(srcdir)/$(DOCBOOK2HTML) $<
-
-EXTRA_DIST=$(dist_built_in) $(DOCBOOK2TXT) $(DOCBOOK2HTML) $(man_MANS) $(omf_in_files)
-CLEANFILES=$(omf_DATA) $(nodist_doc_DATA)
-DISTCLEANFILES=$(nodist_help_DATA)
+dist_man_MANS = passepartout.1x xml2ps.1
diff --git a/doc/users_guide.pp b/doc/users_guide.pp
index 432afe9..f4e7ede 100644
--- a/doc/users_guide.pp
+++ b/doc/users_guide.pp
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document paper_name="A4" doublesided="false" landscape="false" first_page_num="1">
-  <text_stream name="stream1" file="users_guide.xml" transform="../src/xml2ps/docbook.xslt"/>
+  <text_stream name="stream1" file="../help/C/users_guide.xml" transform="../src/xml2ps/docbook.xslt"/>
   <page>
     <frame name="Image pptout-sv.eps" matrix="0.18 0 0 0.18 250.667 742.66" lock="true" flowaround="true" obstaclemargin="0" type="image" file="../logotype/pptout-sv.eps"/>
     <frame name="Image hline.eps" matrix="1.58667 0 0 1 56 740" lock="true" flowaround="true" obstaclemargin="0" type="image" file="examples/hline.eps"/>
diff --git a/doc/.gitignore b/help/.gitignore
similarity index 100%
rename from doc/.gitignore
rename to help/.gitignore
diff --git a/doc/faq.xml b/help/C/faq.xml
similarity index 100%
rename from doc/faq.xml
rename to help/C/faq.xml
diff --git a/doc/legal.xml b/help/C/legal.xml
similarity index 100%
rename from doc/legal.xml
rename to help/C/legal.xml
diff --git a/doc/manual.xml b/help/C/manual.xml
similarity index 100%
rename from doc/manual.xml
rename to help/C/manual.xml
diff --git a/doc/nsfaq.xml b/help/C/nsfaq.xml
similarity index 100%
rename from doc/nsfaq.xml
rename to help/C/nsfaq.xml
diff --git a/doc/users_guide.xml b/help/C/users_guide.xml
similarity index 100%
rename from doc/users_guide.xml
rename to help/C/users_guide.xml
diff --git a/doc/version.txt.in b/help/C/version.txt.in
similarity index 100%
rename from doc/version.txt.in
rename to help/C/version.txt.in
diff --git a/help/Makefile.am b/help/Makefile.am
new file mode 100644
index 0000000..bec4217
--- /dev/null
+++ b/help/Makefile.am
@@ -0,0 +1,71 @@
+nodist_doc_DATA=\
+	C/manual.html \
+	C/manual.txt \
+	$(NULL)
+
+dist_help_DATA=\
+	C/faq.xml \
+	C/legal.xml \
+	C/nsfaq.xml \
+	C/manual.xml \
+	C/users_guide.xml \
+	$(top_srcdir)/logotype/pptout.png \
+	$(NULL)
+dist_built_in=C/version.txt.in
+nodist_help_DATA=$(dist_built_in:.in=)
+helpdir=$(datadir)/gnome/help/passepartout/C
+
+check-local: check-manual
+
+# FIXME: once we use docbook 5.0, make sure each <acronym> has an <alt>
+check-manual: C/manual.xml
+	@echo "[TEST] $<"
+	@$(XMLLINT) --path "$(builddir)/C" --xinclude $< | $(XMLLINT) --path "$(builddir)/C" --valid --noout -
+
+omf_in_files=passepartout-C.omf.in
+omf_DATA=$(omf_in_files:.in=)
+omfdir=$(datadir)/omf/passepartout
+
+passepartout-C.omf: passepartout-C.omf.in Makefile
+	@echo "[GEN]  $@"
+	@sed 's&@DATADIR@&$(datadir)&' $< > $@
+
+# Make symbolic links to the stylesheets:
+# (Remove existing stylesheets first; the -f flag for ln is not portable.)
+# Todo: is basename really portable?
+install-data-hook:
+	rm -f $(DESTDIR)/$(docdir)/*.xslt
+	for i in $(DESTDIR)/$(datadir)/xml/$(PACKAGE)/*.xslt; do \
+		ln -s $(datadir)/xml/$(PACKAGE)/`basename $$i` $(DESTDIR)/$(docdir); \
+	done
+	@if test -z "$(DESTDIR)"; then \
+		echo "$(SCROLLKEEPER_UPDATE)"; \
+		$(SCROLLKEEPER_UPDATE); \
+	else \
+		echo "******" >&2; \
+		echo "*** Don't forget to run \"$(SCROLLKEEPER_UPDATE)\"" >&2 ; \
+		echo "******" >&2; \
+	fi
+
+uninstall-hook:
+	rm -f $(DESTDIR)/$(docdir)/*.xslt
+	$(SCROLLKEEPER_UPDATE)
+
+# documentation stylesheets
+DOCBOOK2TXT = docbook2txt.xslt
+DOCBOOK2HTML = docbook2html.xslt
+
+SUFFIXES=.txt .xml .html
+
+.xml.txt:
+	@echo "[GEN]  $@"
+	xsltproc -o $@ --path "$(builddir)/C" $(srcdir)/$(DOCBOOK2TXT) $<
+
+.xml.html:
+	@echo "[GEN]  $@"
+	xsltproc -o $@ --path "$(builddir)/C" $(srcdir)/$(DOCBOOK2HTML) $<
+
+EXTRA_DIST=$(dist_built_in) $(DOCBOOK2TXT) $(DOCBOOK2HTML) $(man_MANS) $(omf_in_files)
+CLEANFILES=$(omf_DATA) $(nodist_doc_DATA)
+DISTCLEANFILES=$(nodist_help_DATA)
+
diff --git a/doc/docbook2html.xslt b/help/docbook2html.xslt
similarity index 100%
rename from doc/docbook2html.xslt
rename to help/docbook2html.xslt
diff --git a/doc/docbook2txt.xslt b/help/docbook2txt.xslt
similarity index 100%
rename from doc/docbook2txt.xslt
rename to help/docbook2txt.xslt
diff --git a/doc/passepartout-C.omf.in b/help/passepartout-C.omf.in
similarity index 100%
rename from doc/passepartout-C.omf.in
rename to help/passepartout-C.omf.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]