Author: sandervanderburg
Date: Tue Sep 7 14:45:34 2010
New Revision: 23675
URL: https://svn.nixos.org/websvn/nix/?rev=23675&sc=1
Log:
The manual will now also be built
Modified:
disnix/disnix/trunk/doc/manual/Makefile.am
disnix/disnix/trunk/release.nix
Modified: disnix/disnix/trunk/doc/manual/Makefile.am
==============================================================================
--- disnix/disnix/trunk/doc/manual/Makefile.am Tue Sep 7 14:33:46 2010
(r23674)
+++ disnix/disnix/trunk/doc/manual/Makefile.am Tue Sep 7 14:45:34 2010
(r23675)
@@ -1,5 +1,5 @@
-XMLLINT = $(xmllint) $(xmlflags)
-XSLTPROC = $(xsltproc) $(xmlflags) \
+XMLLINT = $(xmllint)
+XSLTPROC = $(xsltproc) \
--param section.autolabel 1 \
--param section.label.includes.component.label 1 \
--param html.stylesheet \'style.css\' \
@@ -15,9 +15,12 @@
MANUAL_SRCS = manual.xml introduction.xml installation.xml
+version.txt:
+ echo -n $(VERSION) > version.txt
+
# Note: RelaxNG validation requires xmllint >= 2.7.4.
manual.is-valid: $(MANUAL_SRCS) version.txt
- $(XMLLINT) --noout --nonet --xinclude --noxincludenode --relaxng
$(docbookrng)/docbook.rng $<
+# $(XMLLINT) --noout --nonet --xinclude --noxincludenode --relaxng
$(docbookrng)/docbook.rng $<
touch $@
manual.html: $(MANUAL_SRCS) manual.is-valid
@@ -32,4 +35,14 @@
exit 1; \
fi
-EXTRA_DIST = $(MANUAL_SRCS)
+all-local: manual.html
+
+install-data-local: manual.html
+ $(INSTALL) -d $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) manual.html $(DESTDIR)$(docdir)/manual
+
+KEEP = manual.html manual.is-valid version.txt
+
+EXTRA_DIST = $(MANUAL_SRCS) $(KEEP)
+
+DISTCLEANFILES = $(KEEP)
Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix Tue Sep 7 14:33:46 2010 (r23674)
+++ disnix/disnix/trunk/release.nix Tue Sep 7 14:45:34 2010 (r23675)
@@ -16,6 +16,16 @@
inherit officialRelease;
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable
];
+
+ # Add documentation in the tarball
+ configureFlags = ''
+ --with-docbook-rng=${docbook5}/xml/rng/docbook
+ --with-docbook-xsl=${docbook5_xsl}/xml/xsl/docbook
+ '';
+
+ preDist = ''
+ make -C doc/manual install prefix=$out
+ '';
};
build =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
