Changeset 0fbcdb1

Timestamp:

06/25/2019 03:01:24 AM (5 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

935d80e

Parents:

015138b

Message:

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/check.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -44 +44 @@
        -->
     <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>

chapter06/check.xml

@@ -43 +43 @@
     <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>
@@ -60 +59 @@
     <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>
 

general.ent

@@ -1 @@
-<!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 &ndash; -->