[Lunar-commits] <moonbase> texlive: fixed symlinks - no more /usr/texmf

[Paul Bredbury]

commit f4730747a12cbe64143830324df029ef879668ea
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sun Feb 13 01:50:13 2011 +0700

    texlive: fixed symlinks - no more /usr/texmf
---
 doc-tools/texlive/BUILD   |    9 +++------
 doc-tools/texlive/DETAILS |    2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc-tools/texlive/BUILD b/doc-tools/texlive/BUILD
index 80c49dc..4491dc0 100644
--- a/doc-tools/texlive/BUILD
+++ b/doc-tools/texlive/BUILD
@@ -13,14 +13,11 @@
   find -name \*.info -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:"  &&
   find -name \*.texi -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:"  &&
   find -name \*.synctex -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:"  &&
+  sed -i -e "s:\$(DESTDIR)\$(texconfigdir):/usr/share/texmf/texconfig:g" -e "s:\$(DESTDIR)\$(texconfdir):/usr/share:g" texk/tetex/Makefile.*  &&
 
   # Direct symlinks from /usr/bin/ into /usr/*share*/texmf... rather than /usr/texmf...
-  sedit "s:\$(REL):/usr/share:" texk/texlive/linked_scripts/Makefile*  &&
-  # Some of the symlinks are still wrong, e.g.:
-  # xmltools -> ../share/texmf-dist/scripts/context/stubs/unix/xmltools
-  # presumably should be:
-  # xmltools -> ../share/texmf-dist/scripts/context/ruby/xmltools.rb
-  # Show them by running:  ls -l /usr/bin | grep stubs
+  find -name Makefile\* -print0 | xargs -0 sed -i -e "s:\$(REL):/usr/share:"  &&
+  sedit "s:\${prefix}/\$(tex:/usr/share/\$(tex:" texk/tex4htk/Makefile*  &&
 
   # Prevent the ridiculous behaviour of deleting, then trying to replace, /usr/bin/man
   sedit "s:rm -f man:true:" texk/texlive/linked_scripts/Makefile*  &&
diff --git a/doc-tools/texlive/DETAILS b/doc-tools/texlive/DETAILS
index 4a0b853..d735674 100644
--- a/doc-tools/texlive/DETAILS
+++ b/doc-tools/texlive/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
      SOURCE3_VFY=sha1:7277db188ded00af37364d03bbcf9614b851c847
         WEB_SITE=http://www.tug.org/texlive/
          ENTERED=20100805
-         UPDATED=20100909
+         UPDATED=20110212
            SHORT="TeX distribution that includes web2c, pdfTeX, e-Tex and more"
 
 # Text from http://www.tug.org/texlive/