Author: renodr
Date: Mon Jun 24 20:01:24 2019
New Revision: 11624
Log:
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=
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter06/check.xml
trunk/BOOK/general.ent
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Wed Jun 19 11:19:25 2019 (r11623)
+++ trunk/BOOK/chapter01/changelog.xml Mon Jun 24 20:01:24 2019 (r11624)
@@ -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>
Modified: trunk/BOOK/chapter06/check.xml
==============================================================================
--- trunk/BOOK/chapter06/check.xml Wed Jun 19 11:19:25 2019 (r11623)
+++ trunk/BOOK/chapter06/check.xml Mon Jun 24 20:01:24 2019 (r11624)
@@ -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>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Wed Jun 19 11:19:25 2019 (r11623)
+++ trunk/BOOK/general.ent Mon Jun 24 20:01:24 2019 (r11624)
@@ -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">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page