소스 검색

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

Douglas R. Reno 4 년 전
부모
커밋
77ad8bc882
3개의 변경된 파일17개의 추가작업 그리고 6개의 파일을 삭제
  1. 12 0
      chapter01/changelog.xml
  2. 2 3
      chapter06/check.xml
  3. 3 3
      general-orig.ent

+ 12 - 0
chapter01/changelog.xml

@@ -42,6 +42,18 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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>

+ 2 - 3
chapter06/check.xml

@@ -42,8 +42,7 @@
 
     <para>准备安装 Check:</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>构建该软件包:</para>
 
@@ -57,7 +56,7 @@
 
     <para>安装该软件包,并修复一个脚本:</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>

+ 3 - 3
general-orig.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 &ndash; -->
 <!ENTITY milestone       "8.5">