Build: Add --disable-doc to configure.

diff --git a/INSTALL b/INSTALL
index bdbde666a91275cbfbc90bb111983cd9472c2e7e..ba1939ac7c4ca6e3b2f09f929de4b08722ce5e77 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -253,6 +253,12 @@ XZ Utils Installation
                 Don't install the scripts xzdiff, xzgrep, xzmore, xzless,
                 and their symlinks.
 
+    --disable-doc
+                Don't install the documentation files to $docdir
+                (often /usr/doc/xz or /usr/local/doc/xz). Man pages
+                will still be installed. The $docdir can be changed
+                with --docdir=DIR.
+
     --disable-assembler
                 liblzma includes some assembler optimizations. Currently
                 there is only assembler code for CRC32 and CRC64 for

diff --git a/Makefile.am b/Makefile.am
index 8aa6dfc561234063044ededfaacea367b792e453..51cc56f291fe5f606a0d6f361a06081c01a5d3db 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ endif
 
 SUBDIRS += src po tests
 
+if COND_DOC
 dist_doc_DATA = \
        AUTHORS \
        COPYING \
@@ -42,6 +43,7 @@ examplesolddir = $(docdir)/examples_old
 dist_examplesold_DATA = \
        doc/examples_old/xz_pipe_comp.c \
        doc/examples_old/xz_pipe_decomp.c
+endif
 
 EXTRA_DIST = \
        extra \

diff --git a/configure.ac b/configure.ac
index 541181f1381dd25a8f2634ed3bd4afe04c11b723..0fd8c1e4b2640e9f48c7a9929669904bcf40ffe4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -402,6 +402,12 @@ AC_ARG_ENABLE([scripts], [AC_HELP_STRING([--disable-scripts],
        [], [enable_scripts=yes])
 AM_CONDITIONAL([COND_SCRIPTS], [test x$enable_scripts != xno])
 
+AC_ARG_ENABLE([doc], [AC_HELP_STRING([--disable-doc],
+               [do not install documentation files to docdir
+               (man pages will still be installed)])],
+       [], [enable_doc=yes])
+AM_CONDITIONAL([COND_DOC], [test x$enable_doc != xno])
+
 
 ###############################################################################
 # Checks for programs.