Changeset 41f609f for chapter08

Timestamp:

11/15/2022 11:30:11 PM (23 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib, xry111/multilib

Children:

a03b7d95

Parents:

2106da2 (diff), 89c3f71 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter08

Files:

• dbus.xml (modified) (1 diff)
• procps.xml (modified) (1 diff)
• util-linux.xml (modified) (3 diffs)

chapter08/dbus.xml

@@ -56 +56 @@
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
-            --docdir=/usr/share/doc/dbus-&dbus-version; \
+            --docdir=/usr/share/doc/dbus-&dbus-version;  \
             --with-system-socket=/run/dbus/system_bus_socket</userinput></screen>
 

chapter08/procps.xml

@@ -43 +43 @@
     <para>Prepare procps-ng for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                            \
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                           \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-            --disable-static                         \
+            --disable-static                        \
             --disable-kill</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                            \
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                           \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-            --disable-static                         \
-            --disable-kill                           \
+            --disable-static                        \
+            --disable-kill                          \
             --with-systemd</userinput></screen>
 

chapter08/util-linux.xml

@@ -45 +45 @@
     <para>Prepare Util-linux for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
+<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --sbindir=/usr/sbin  \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -60 +59 @@
             --without-python     \
             --without-systemd    \
-            --without-systemdsystemunitdir</userinput></screen>
-
-<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
+            --without-systemdsystemunitdir /
+            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+
+<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --sbindir=/usr/sbin  \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -75 +74 @@
             --disable-pylibmount \
             --disable-static     \
-            --without-python</userinput></screen>
+            --without-python     \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <para>The --disable and --without options prevent warnings about