Changeset 373b6ea for BOOK/network/multilib

Timestamp:

Jan 1, 2010, 3:08:07 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

012dfcb

Parents:

129802d (diff), 52b24ce (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:

Merged Upstream with Local Repo.

File:

• BOOK/network/multilib/dhcpcd.xml (modified) (2 diffs)

BOOK/network/multilib/dhcpcd.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>make CC="gcc ${BUILD64}" PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
-    DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd</userinput></screen>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
+    --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -41 +41 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make CC="gcc ${BUILD64}" PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
-    DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dhcpcd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dhcpcd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dhcpcd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>