cvs commit: BLFS/BOOK/x/installing/xfree86 xfree86-config.xml xfree86-exp.xml xfree86-inst.xml

igor at linuxfromscratch.org igor at linuxfromscratch.org
Sat Apr 17 14:09:48 PDT 2004


igor        04/04/17 15:09:48

  Modified:    BOOK/x/installing/xfree86 xfree86-config.xml xfree86-exp.xml
                        xfree86-inst.xml
  Log:
  fixed xfree86 symlinks
  
  Revision  Changes    Path
  1.16      +1 -2      BLFS/BOOK/x/installing/xfree86/xfree86-config.xml
  
  Index: xfree86-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-config.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- xfree86-config.xml	15 Apr 2004 03:54:46 -0000	1.15
  +++ xfree86-config.xml	17 Apr 2004 21:09:48 -0000	1.16
  @@ -21,8 +21,7 @@
   <screen><userinput><command>source ~/.bash_profile</command></userinput></screen>
   
   <para>Set up your mouse:
  -<screen><userinput><command>cd /dev
  -ln -s psaux mouse</command></userinput></screen>
  +<screen><userinput><command>ln -s psaux /dev/mouse</command></userinput></screen>
   
   Adjust the symbolic link as necessary for other types of mice.  For instance, 
   a serial mouse on the first serial port would be linked to ttyS1.</para>
  
  
  
  1.13      +4 -4      BLFS/BOOK/x/installing/xfree86/xfree86-exp.xml
  
  Index: xfree86-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-exp.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- xfree86-exp.xml	26 Feb 2004 23:16:37 -0000	1.12
  +++ xfree86-exp.xml	17 Apr 2004 21:09:48 -0000	1.13
  @@ -18,10 +18,10 @@
   files and only rebuilds those files or programs that are out 
   of date.</para></note>
   
  -<para><command>ln -sf /usr/X11R6/bin /usr/bin/X11</command>,
  -<command>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11</command>, and
  -<command>ln -sf /usr/X11R6/include/X11 /usr/include/X11</command>: These 
  -commands are present to enable other (broken) packages to build
  +<para><screen><command>ln -sf ../X11R6/bin /usr/bin/X11
  +ln -sf ../X11R6/lib/X11 /usr/lib/X11
  +ln -sf ../X11R6/include/X11 /usr/include/X11</command></screen>
  +These commands are present to enable other (broken) packages to build
   against <application>XFree86</application>.  We do this even though the Filesystem Hierarchy Standard
   says:
   "In general, software must not be installed or managed via the above 
  
  
  
  1.29      +3 -4      BLFS/BOOK/x/installing/xfree86/xfree86-inst.xml
  
  Index: xfree86-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-inst.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- xfree86-inst.xml	11 Mar 2004 06:50:24 -0000	1.28
  +++ xfree86-inst.xml	17 Apr 2004 21:09:48 -0000	1.29
  @@ -204,9 +204,9 @@
   <screen><userinput><command>( make WORLDOPTS="" World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS ) &&
   make install &&
   make install.man &&
  -ln -sf /usr/X11R6/bin /usr/bin/X11 &&
  -ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &&
  -ln -sf /usr/X11R6/include/X11 /usr/include/X11</command></userinput></screen>
  +ln -sf ../X11R6/bin /usr/bin/X11 &&
  +ln -sf ../X11R6/lib/X11 /usr/lib/X11 &&
  +ln -sf ../X11R6/include/X11 /usr/include/X11</command></userinput></screen>
   
   </sect3>
   
  @@ -237,4 +237,3 @@
   
   </sect3>
   </sect2>
  -
  
  
  



More information about the blfs-book mailing list