Changeset bc2e3fa for BOOK/temp-system


Ignore:
Timestamp:
Dec 7, 2006, 11:23:24 PM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1e184e11
Parents:
8473983
Message:

Reverting of Sysroot Changes

Location:
BOOK/temp-system
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • BOOK/temp-system/common/bash.xml

    r8473983 rbc2e3fa  
    7575    xpointer="xpointer(//*[@os='m'])"/>
    7676
    77 <screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     77<screen os="n"><userinput>make install</userinput></screen>
    7878
    7979    <para os="ae">Make a link for programs that use <command>sh</command> for
    8080    a shell:</para>
    8181
    82 <screen os="af"><userinput>ln -sv bash ${CLFS}/tools/bin/sh</userinput></screen>
     82<screen os="af"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
    8383
    8484  </sect2>
  • BOOK/temp-system/common/binutils.xml

    r8473983 rbc2e3fa  
    6767    xpointer="xpointer(//*[@os='bh'])"/>
    6868
    69     <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     69    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     70    href="../../cross-tools/common/binutils.xml"
     71    xpointer="xpointer(//*[@os='bi'])"/>
    7072
    7173  </sect2>
  • BOOK/temp-system/common/bzip2.xml

    r8473983 rbc2e3fa  
    3838    <para os="cd">Install the package:</para>
    3939
    40 <screen os="ce"><userinput>make PREFIX=${CLFS}/tools install</userinput></screen>
     40<screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen>
    4141
    4242  </sect2>
  • BOOK/temp-system/common/choose.xml

    r8473983 rbc2e3fa  
    2828 commands to see if you can chroot:</para>
    2929
    30 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    31 ${CLFS}/tools/lib/&glibc-ld-name; --library-path ${CLFS}/tools/lib \
    32     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     30<screen ><userinput>/tools/lib/libc.so.6
     31/tools/bin/gcc -v</userinput></screen>
    3332
    3433  <para>If either of these commands fail, you will have to follow the boot
  • BOOK/temp-system/common/coreutils.xml

    r8473983 rbc2e3fa  
    4545    <para os="bh">Install the package:</para>
    4646
    47 <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     47<screen os="bi"><userinput>make install</userinput></screen>
    4848
    4949  </sect2>
  • BOOK/temp-system/common/diffutils.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>
  • BOOK/temp-system/common/findutils.xml

    r8473983 rbc2e3fa  
    4848    xpointer="xpointer(//*[@os='g'])"/>
    4949
    50 <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     50    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     51    href="../../final-system/common/findutils.xml"
     52    xpointer="xpointer(//*[@os='h'])"/>
    5153
    5254  </sect2>
  • BOOK/temp-system/common/gawk.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>
  • BOOK/temp-system/common/grep.xml

    r8473983 rbc2e3fa  
    5858    xpointer="xpointer(//*[@os='f'])"/>
    5959
    60 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61    href="../../final-system/common/grep.xml"
     62    xpointer="xpointer(//*[@os='g'])"/>
    6163
    6264  </sect2>
  • BOOK/temp-system/common/gzip.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="ac"><userinput>./configure --prefix=/tools \
     29<screen os="b"><userinput>./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3131
     
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/gzip.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>
  • BOOK/temp-system/common/make.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/make.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>
  • BOOK/temp-system/common/ncurses.xml

    r8473983 rbc2e3fa  
    9090    xpointer="xpointer(//*[@os='f'])"/>
    9191
    92 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     92    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     93    href="../../final-system/common/ncurses.xml"
     94    xpointer="xpointer(//*[@os='g'])"/>
    9395
    9496  </sect2>
  • BOOK/temp-system/common/patch.xml

    r8473983 rbc2e3fa  
    2323    <title>Installation of Patch</title>
    2424
    25     <para os="p1">This patch will add the ability to use DESTDIR:</para>
    26 
    27 <screen os="p2"><userinput>patch -Np1 -i ../&patch-destdir-patch;</userinput></screen>
    28 
    2925    <para os="a">Prepare Patch for compilation:</para>
    3026
     
    3834    <para os="e">Install the package:</para>
    3935
    40 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    4137
    4238  </sect2>
  • BOOK/temp-system/common/sed.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>
  • BOOK/temp-system/common/tar.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/tar.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>
  • BOOK/temp-system/common/texinfo.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/texinfo.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>
  • BOOK/temp-system/common/zlib.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Zlib</title>
    24 
    25     <para os="p1">This patch will add the ability to use DESTDIR:</para>
    26 
    27 <screen os="p2"><userinput>patch -Np1 -i ../&zlib-destdir-patch;</userinput></screen>
    2824
    2925    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/temp-system/mips64/choose.xml

    r8473983 rbc2e3fa  
    2323    xpointer="xpointer(//*[@os='c'])"/>
    2424
    25 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    26 ${CLFS}/tools/lib32/&glibc-ld-name; ${CLFS}/tools/lib32/libc.so.6
    27 ${CLFS}/tools/lib64/&glibc-ld-name; ${CLFS}/tools/lib64/libc.so.6
    28 ${CLFS}/tools/lib64/&glibc-ld-name; --library-path ${CLFS}/tools/lib64 \
    29     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     25<screen ><userinput>/tools/lib/libc.so.6
     26/tools/lib32/libc.so.6
     27/tools/lib64/libc.so.6
     28/tools/bin/gcc -v</userinput></screen>
    3029
    3130    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/temp-system/multilib/bash.xml

    r8473983 rbc2e3fa  
    4444
    4545<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    46    ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     46   ./configure --prefix=/tools \
     47   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4748   --without-bash-malloc --cache-file=config.cache</userinput></screen>
    4849
  • BOOK/temp-system/multilib/choose.xml

    r8473983 rbc2e3fa  
    2323    xpointer="xpointer(//*[@os='c'])"/>
    2424
    25 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    26 ${CLFS}/tools/lib64/&glibc-ld-name; ${CLFS}/tools/lib64/libc.so.6
    27 ${CLFS}/tools/lib64/&glibc-ld-name; --library-path ${CLFS}/tools/lib64 \
    28     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     25<screen ><userinput>/tools/lib/libc.so.6
     26/tools/lib64/libc.so.6
     27/tools/bin/gcc -v</userinput></screen>
    2928
    3029  <para os="d">If any of these commands fail, you will have to follow the boot
    3130  method.</para>
     31
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/temp-system/multilib/gzip.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3030  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3131
  • BOOK/temp-system/multilib/make.xml

    r8473983 rbc2e3fa  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/make.xml"
     45    href="../../final-system/common/make.xml"
    4646    xpointer="xpointer(//*[@os='g'])"/>
    4747
  • BOOK/temp-system/multilib/patch.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Patch</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/patch.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../common/patch.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/temp-system/multilib/zlib.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Zlib</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/zlib.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../common/zlib.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/temp-system/sparc-chapter.xml

    r8473983 rbc2e3fa  
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
    3433  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
    3534
  • BOOK/temp-system/x86/gcc.xml

    r8473983 rbc2e3fa  
    6666
    6767<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
    68 sed -e "s@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 ${CLFS}/tools/include@g" \
     68sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
    6969    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
    7070
     
    111111    <para os="co">Install the package:</para>
    112112
    113 <screen os="cp"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     113<screen os="cp"><userinput>make install</userinput></screen>
    114114
    115115    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    117117    xpointer="xpointer(//*[@os='w'])"/>
    118118
    119 <screen os="cq"><userinput>ln -sv gcc ${CLFS}/tools/bin/cc</userinput></screen>
     119<screen os="cq"><userinput>ln -sv gcc /tools/bin/cc</userinput></screen>
    120120
    121121  </sect2>
  • BOOK/temp-system/x86_64/gcc.xml

    r8473983 rbc2e3fa  
    7676
    7777<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
    78 sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@${CLFS}/cross-tools/bin/${CC}@g" \
     78sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
    7979   gcc/Makefile.in.orig2 > gcc/Makefile.in</userinput></screen>
    8080
Note: See TracChangeset for help on using the changeset viewer.