From 0fbcdb16bfd48cf59e48bf3a52f0cf4a548c16d9 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Tue, 25 Jun 2019 03:01:24 +0000 Subject: [PATCH] Fix documentation installation in Check so that it's installed in a versioned directory. We do this by specifying the docdir= on the make install line, forcing an override Otherwise it installs it in /usr/share/doc/check, and does NOT honor the configure option of --docdir= git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11624 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 12 ++++++++++++ chapter06/check.xml | 5 ++--- general.ent | 6 +++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 86073941d..0fb391ce4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,18 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2019-06-24 + + + [renodr] - Fixed issue with installing Check's documentation + in a verisoned directory. Thanks goes to Ryan Marsaw for the report. + This was fixed be removing the unrecognized/unused --docdir + and replacing it with a "docdir=" in the make install command. + + + + 2019-06-18 diff --git a/chapter06/check.xml b/chapter06/check.xml index 5374de5c1..739af9803 100644 --- a/chapter06/check.xml +++ b/chapter06/check.xml @@ -42,8 +42,7 @@ Prepare Check for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/check-&check-version; +./configure --prefix=/usr Build the package: @@ -59,7 +58,7 @@ Install the package and fix a script: -make install + make docdir=/usr/share/doc/check-&check-version; install sed -i '1 s/tools/usr/' /usr/bin/checkmk diff --git a/general.ent b/general.ent index abe9d2187..1b9e68139 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - +