From c237010ae756bbca5f858f86251d7d53408ccd58 Mon Sep 17 00:00:00 2001
From: hinder <hinder@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Wed, 19 Oct 2011 18:02:44 +0000
Subject: doc: Use absolute instead of relative paths for arrangement and thorn
 documentation

This fixes a problem which occurs when the doc directory is actually a
symbolic link.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4744 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/sbin/ArrangementDoc     | 4 +++-
 lib/sbin/ArrangementDocHTML | 6 ++++--
 lib/sbin/ThornDoc           | 4 +++-
 lib/sbin/ThornDocHTML       | 6 ++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/sbin/ArrangementDoc b/lib/sbin/ArrangementDoc
index d30eb8a4..8345bb84 100755
--- a/lib/sbin/ArrangementDoc
+++ b/lib/sbin/ArrangementDoc
@@ -8,6 +8,8 @@ echo "Creating arrangement documentations..."
 # Selected arrangement; process all arrangements if this is empty
 selection="$1"
 
+abspath=$PWD
+
 for arr in `cd arrangements; echo *`; do
     if test -d arrangements/$arr; then
         if test -z "$selection" || test "$arr" == "$selection"; then
@@ -19,7 +21,7 @@ for arr in `cd arrangements; echo *`; do
                 (
                     cd doc/ArrangementDoc/$arr
                     rm -f documentation.tex documentation.pdf
-                    path=../../../arrangements/$arr/doc
+                    path=$abspath/arrangements/$arr/doc
                     < $path/documentation.tex sed -e 's+\(\\includegraphics.*\){ *\(.*\) *}+\1{'"$path"'/\2}+g' |
                     sed -e 's+\(\\input *\)\(.*\)+\1'"$path"'/\2+g' > documentation.tex
                     
diff --git a/lib/sbin/ArrangementDocHTML b/lib/sbin/ArrangementDocHTML
index ce2b7e28..079b88ac 100755
--- a/lib/sbin/ArrangementDocHTML
+++ b/lib/sbin/ArrangementDocHTML
@@ -11,6 +11,8 @@ type -P htlatex &>/dev/null || { echo "htlatex not found.  Aborting." >&2; exit
 # Selected arrangement; process all arrangements if this is empty
 selection="$1"
 
+abspath=$PWD
+
 for arr in `cd arrangements; echo *`; do
   if test -d arrangements/$arr; then
     if test -z "$selection" || test "$arr" == "$selection"; then
@@ -21,12 +23,12 @@ for arr in `cd arrangements; echo *`; do
         (
           cd doc/HTML/ArrangementDoc/$arr
           rm -f documentation.tex documentation.html documentation.css documentation*.png
-          path=../../../../arrangements/$arr/doc
+          path=$abspath/arrangements/$arr/doc
           < $path/documentation.tex sed -e 's+\(\\includegraphics.*\){ *\(.*\) *}+\1{'"$path"'/\2}+g' |
           sed -e 's+\(\\input *\)\(.*\)+\1'"$path"'/\2+g' |
           sed -e 's+\\usepackage{../../../doc/latex/cactus}+\\usepackage{../../../../doc/latex/cactus}+g' > documentation.tex
 
-          ../../../../lib/sbin/ConvertFigures $path
+          $abspath/lib/sbin/ConvertFigures $path
 
           {
             htlatex documentation   "" "" "" -interaction=nonstopmode > LATEX_MESSAGES 2>&1
diff --git a/lib/sbin/ThornDoc b/lib/sbin/ThornDoc
index a5d73404..9f6ca172 100755
--- a/lib/sbin/ThornDoc
+++ b/lib/sbin/ThornDoc
@@ -8,6 +8,8 @@ echo "Creating thorn documentations..."
 # Selected thorn; process all thorns if this is empty
 selection="$1"
 
+abspath=$PWD
+
 for arr in `cd arrangements; echo *`; do
     if test -d arrangements/$arr; then
         for th in `cd arrangements/$arr; echo *`; do
@@ -22,7 +24,7 @@ for arr in `cd arrangements; echo *`; do
                         (
                             cd doc/ThornDoc/$arr/$th
                             rm -f documentation.tex documentation.pdf
-                            path=../../../../arrangements/$arr/$th/doc
+                            path=$abspath/arrangements/$arr/$th/doc
                             < $path/documentation.tex sed -e 's+\(\\includegraphics.*\){ *\(.*\) *}+\1{'"$path"'/\2}+g' |
                             sed -e 's+\(\\input *\)\(.*\)+\1'"$path"'/\2+g' > documentation.tex
                             
diff --git a/lib/sbin/ThornDocHTML b/lib/sbin/ThornDocHTML
index 24151b52..c1f0f61a 100755
--- a/lib/sbin/ThornDocHTML
+++ b/lib/sbin/ThornDocHTML
@@ -11,6 +11,8 @@ type -P htlatex &>/dev/null || { echo "htlatex not found.  Aborting." >&2; exit
 # Selected thorn; process all thorns if this is empty
 selection="$1"
 
+abspath=$PWD
+
 for arr in `cd arrangements; echo *`; do
   if test -d arrangements/$arr; then
     for th in `cd arrangements/$arr; echo *`; do
@@ -23,12 +25,12 @@ for arr in `cd arrangements; echo *`; do
             (
               cd doc/HTML/ThornDoc/$arr/$th
               rm -f documentation.tex documentation.html documentation.css documentation*.png
-              path=../../../../../arrangements/$arr/$th/doc
+              path=$abspath/arrangements/$arr/$th/doc
               < $path/documentation.tex sed -e 's+\(\\includegraphics.*\){ *\(.*\) *}+\1{'"$path"'/\2}+g' |
               sed -e 's+\(\\input *\)\(.*\)+\1'"$path"'/\2+g' | 
               sed -e 's+\\usepackage{../../../../doc/latex/cactus}+\\usepackage{../../../../../doc/latex/cactus}+g' > documentation.tex
 
-              ../../../../../lib/sbin/ConvertFigures $path
+              $abspath/lib/sbin/ConvertFigures $path
 
               echo "  Running htlatex..."
               {
-- 
cgit v1.2.3