fixes to tex-info stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2865 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index cc1d2ec77bbce34534c8c117bf8453efa5ec7300..3d9e1a43461fecd4dbaa5ff64f52c2926ef85e9c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * scripts/TeXFiles.sh: use -follow predicate in "find" to follow
+       symbolic links
+
 2001-10-11  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * CREDITS: add two unsung heroes

diff --git a/lib/scripts/TeXFiles.sh b/lib/scripts/TeXFiles.sh
index 75ec6c1755ad7cced064fdad2c30b760a219b54d..0863b1501be6cf6f693e1d65dc78edada71a68d4 100755 (executable)
--- a/lib/scripts/TeXFiles.sh
+++ b/lib/scripts/TeXFiles.sh
@@ -95,18 +95,18 @@ for TEXMFLSR in "$@"; do            # go through the dirs
   echo "Dir: <$TEXMFLSR>"
 case "$1" in                           # list all files with suffix bst
     "cls")
-       find $TEXMFLSR -name *.cls >> $CLS_STYLEFILE
+       find $TEXMFLSR -follow -name *.cls >> $CLS_STYLEFILE
     ;;
     "sty")
-       find $TEXMFLSR -name *.sty >> $STY_STYLEFILE
+       find $TEXMFLSR -follow -name *.sty >> $STY_STYLEFILE
     ;;
     "bst")
-       find $TEXMFLSR -name *.bst >> $BST_STYLEFILE
+       find $TEXMFLSR -follow -name *.bst >> $BST_STYLEFILE
     ;;
     *) 
-       find $TEXMFLSR -name *.cls >> $CLS_STYLEFILE
-       find $TEXMFLSR -name *.sty >> $STY_STYLEFILE
-       find $TEXMFLSR -name *.bst >> $BST_STYLEFILE
+       find $TEXMFLSR -follow -name *.cls >> $CLS_STYLEFILE
+       find $TEXMFLSR -follow -name *.sty >> $STY_STYLEFILE
+       find $TEXMFLSR -follow -name *.bst >> $BST_STYLEFILE
     ;;
 esac
 

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index d2bbf49391f4403f42b13f0959887b92ba5e33a6..83fccaa9d9b07a5b439731e0dc99eac33bd983ea 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ControlTexinfo.C (getContents): use the right file for .sty files
+
 2001-10-10  Herbert Voss  <voss@perce.de>
 
        * ControlTexinfo.C: new path for the shellscript TeXFiles.sh

diff --git a/src/frontends/controllers/ControlTexinfo.C b/src/frontends/controllers/ControlTexinfo.C
index 7ebdbb4b71d41a7263f65c9a45cf33f262f01267..5c24917d4bb607d55e563a93dac20eed84db238d 100644 (file)
--- a/src/frontends/controllers/ControlTexinfo.C
+++ b/src/frontends/controllers/ControlTexinfo.C
@@ -92,7 +92,7 @@ ControlTexinfo::getContents(texFileSuffix type, bool withFullPath) const
                filename = clsFilename;
                break;
        case sty:
-               filename = clsFilename;
+               filename = styFilename;
                break;
        }