summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-10-03 21:22:07 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-10-03 21:22:07 +0000
commit23b57387e31c1c9b0f94d786e55c6847078f5812 (patch)
tree360cefd2c140699f6a97de4c52158092bb41a4cd
parentb19864fc5c746ae088a44077ce551199c8df4a60 (diff)
- For all drivers that have a <driver>.sgml file, add code in their build
system to build the README file at make dist time - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that will check if the required tools and files exist, and if so set a conditional. - util/modular/symlink.sh - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml - Add all the README.<driver> to the list of excluded files - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make it spew less warnings when the text file is built.
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac2
2 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 5db6c87..9a2fb75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,4 +21,11 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+if BUILD_LINUXDOC
+README: README.sgml
+ $(MAKE_TEXT) README.sgml && mv README.txt README
+
+EXTRA_DIST += README.sgml
+endif
+
EXTRA_DIST = XF86Config.indy
diff --git a/configure.ac b/configure.ac
index 9944922..fb1c1b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ AC_SUBST([moduledir])
XORG_RELEASE_VERSION
+XORG_CHECK_LINUXDOC
+
AC_OUTPUT([
Makefile
src/Makefile