Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snf-ganeti
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
itminedu
snf-ganeti
Commits
f05c99f3
Commit
f05c99f3
authored
16 years ago
by
Michael Hanselmann
Browse files
Options
Downloads
Patches
Plain Diff
Build HTML from RST input
This patch also adds the design documents to Makefile.am. Reviewed-by: iustinp
parent
b27b39b0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile.am
+13
-0
13 additions, 0 deletions
Makefile.am
configure.ac
+8
-0
8 additions, 0 deletions
configure.ac
with
21 additions
and
0 deletions
Makefile.am
+
13
−
0
View file @
f05c99f3
...
@@ -106,7 +106,16 @@ docsgml = \
...
@@ -106,7 +106,16 @@ docsgml = \
doc/rapi.sgml
\
doc/rapi.sgml
\
doc/iallocator.sgml
doc/iallocator.sgml
docrst
=
\
doc/design-2.0-commandline-parameters.rst
\
doc/design-2.0-disk-handling.rst
\
doc/design-2.0-index.rst
\
doc/design-2.0-job-queue.rst
\
doc/design-2.0-locking.rst
\
doc/design-2.0-master-daemon.rst
doc_DATA
=
\
doc_DATA
=
\
$(
patsubst %.rst,%.html,
$(
docrst
))
\
$(
patsubst %.sgml,%.html,
$(
docsgml
))
\
$(
patsubst %.sgml,%.html,
$(
docsgml
))
\
$(
patsubst %.sgml,%.pdf,
$(
docsgml
))
$(
patsubst %.sgml,%.pdf,
$(
docsgml
))
...
@@ -134,6 +143,7 @@ EXTRA_DIST = \
...
@@ -134,6 +143,7 @@ EXTRA_DIST = \
DEVNOTES
\
DEVNOTES
\
autotools/docbook-wrapper
\
autotools/docbook-wrapper
\
devel/upload.in
\
devel/upload.in
\
$(
docrst
)
\
$(
docsgml
)
\
$(
docsgml
)
\
doc/build-rapi-resources-doc
\
doc/build-rapi-resources-doc
\
doc/examples/ganeti.initd.in
\
doc/examples/ganeti.initd.in
\
...
@@ -223,6 +233,9 @@ doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
...
@@ -223,6 +233,9 @@ doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
doc/%.html
:
doc/%.in $(DOCBOOK_WRAPPER)
doc/%.html
:
doc/%.in $(DOCBOOK_WRAPPER)
$(
DOCBOOK_WRAPPER
)
$<
$@
$(
DOCBOOK_WRAPPER
)
$<
$@
doc/%.html
:
doc/%.rst
$(
RST2HTML
)
$<
$@
doc/rapi.pdf doc/rapi.html
:
doc/rapi-resources.sgml
doc/rapi.pdf doc/rapi.html
:
doc/rapi-resources.sgml
doc/rapi-resources.sgml
:
$(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
doc/rapi-resources.sgml
:
$(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
8
−
0
View file @
f05c99f3
...
@@ -125,6 +125,14 @@ then
...
@@ -125,6 +125,14 @@ then
AC_MSG_ERROR([docbook2html not found])
AC_MSG_ERROR([docbook2html not found])
fi
fi
# Check for rst programs
AC_ARG_VAR(RST2HTML, [rst2html path])
AC_PATH_PROG(RST2HTML, [rst2html], [])
if test -z "$RST2HTML"
then
AC_MSG_ERROR([rst2html not found])
fi
# Check for Python
# Check for Python
AM_PATH_PYTHON(2.4)
AM_PATH_PYTHON(2.4)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment