gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix documentation installation in Check so that it's installed in a versioned directory.

Browse Source 
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
This commit is contained in:
Douglas R. Reno 2019-06-25 03:01:24 +00:00
parent 015138b994
commit 0fbcdb16bf
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chapter01/changelog.xml
View File

@ -42,6 +42,18 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. 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> <listitem>
<para>2019-06-18</para> <para>2019-06-18</para>
<itemizedlist> <itemizedlist>

5
chapter06/check.xml
View File

@ -42,8 +42,7 @@
<para>Prepare Check for compilation:</para> <para>Prepare Check for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
--docdir=/usr/share/doc/check-&check-version;</userinput></screen>
<para>Build the package:</para> <para>Build the package:</para>
@ -59,7 +58,7 @@
<para>Install the package and fix a script:</para> <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> sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
</sect2> </sect2>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20190618"> <!ENTITY version "SVN-20190624">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; <!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases --> Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20190618-systemd"> <!ENTITY versiond "20190624-systemd">
<!ENTITY short-versiond "systemd"> <!ENTITY short-versiond "systemd">
<!ENTITY generic-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; --> <!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.5"> <!ENTITY milestone "8.5">