diff options
| author | Douglas R. Reno <renodr@linuxfromscratch.org> | 2019-06-25 03:01:24 +0000 |
|---|---|---|
| committer | Douglas R. Reno <renodr@linuxfromscratch.org> | 2019-06-25 03:01:24 +0000 |
| commit | 0fbcdb16bfd48cf59e48bf3a52f0cf4a548c16d9 (patch) | |
| tree | b82d451d7da805b642e1bd4b3ae1d0622a1d375d | |
| parent | 015138b994e9e7d30563f9a6d25d8dfe1638d0e5 (diff) | |
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
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter06/check.xml | 5 | ||||
| -rw-r--r-- | 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 @@ -43,6 +43,18 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2019-06-24</para> + <itemizedlist> + <listitem> + <para>[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.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2019-06-18</para> <itemizedlist> <listitem> 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 @@ <para>Prepare Check for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --docdir=/usr/share/doc/check-&check-version;</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Build the package:</para> @@ -59,7 +58,7 @@ <para>Install the package and fix a script:</para> -<screen><userinput remap="install">make install + <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen> </sect2> diff --git a/general.ent b/general.ent index abe9d2187..1b9e68139 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20190618"> +<!ENTITY version "SVN-20190624"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20190618-systemd"> +<!ENTITY versiond "20190624-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "June 18, 2019"> +<!ENTITY releasedate "June 24, 2019"> <!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.5"> |