Changeset 03e6a40 for BOOK/final-system/common/bash.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/bash.xml (modified) (2 diffs)

BOOK/final-system/common/bash.xml

@@ -27 +27 @@
 
 <c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline</c:command>
+    --without-bash-malloc --with-installed-readline \
+    --docdir=/usr/share/doc/bash-&bash-version;</c:command>
 <c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline</c:command>
+    --without-bash-malloc --with-installed-readline \
+    --docdir=/usr/share/doc/bash-&bash-version;</c:command>
 
 <!--
@@ -56 +58 @@
     <c:para>Install the package:</c:para>
 
-<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
+<c:command>make install</c:command>
 
     <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing