[Clfs-commits] commit: r4319 - in /branches/clfs-sysroot/BOOK/final-system/common: module-init-tools.xml shadow.xml

[svn at cross-lfs.org]

Author: jciccone
Date: Sun Jan  4 22:45:42 2009
New Revision: 4319

Log:
Port configure command from trunk for module-init-tools.
Port the groups man page sed from trunk for shadow.

Modified:
    branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml
    branches/clfs-sysroot/BOOK/final-system/common/shadow.xml

Modified: branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml Sun Jan  4 22:45:42 2009
@@ -28,7 +28,8 @@
     <para os="a">Prepare Module-Init-Tools for compilation:</para>
 
 <screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --prefix=/ --enable-zlib</userinput></screen>
+    --prefix=/usr --bindir=/bin \
+    --sbindir=/sbin --enable-zlib</userinput></screen>
 
     <variablelist os="c">
       <title>The meaning of the configure options:</title>

Modified: branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/shadow.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/shadow.xml Sun Jan  4 22:45:42 2009
@@ -41,8 +41,8 @@
     <para os="d">Prepare Shadow for compilation:</para>
 
 <screen os="e"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/lib --sysconfdir=/etc --enable-shared \
-    --without-libpam --without-audit --without-selinux \
+    --sysconfdir=/etc --without-libpam \
+    --without-audit --without-selinux \
     --cache-file=config.cache</userinput></screen>
 
 <para os="f">The meaning of the configure options:</para>
@@ -80,9 +80,11 @@
 
 <screen os="i"><userinput>cp src/Makefile{,.orig}
 sed 's/groups$(EXEEXT) //' src/Makefile.orig > src/Makefile
-cp man/Makefile{,.orig}
-sed -e '/groups1.xml/d' \
-    -e 's/groups.1//' man/Makefile.orig > man/Makefile</userinput></screen>
+for mkf in $(find man -name Makefile)
+do
+  cp ${mkf}{,.orig}
+  sed -e '/groups.1.xml/d' -e 's/groups.1 //' ${mkf}.orig > ${mkf}
+done</userinput></screen>
 
     <para os="j">Compile the package:</para>