diff options
| author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2009-02-03 00:54:06 +0000 |
|---|---|---|
| committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2009-02-03 00:54:06 +0000 |
| commit | e0a2eaae100709deb581fefd48b5faa2c517a143 (patch) | |
| tree | 773dd3ff17c403104313b80e67e20d02d72d899f | |
| parent | 8d8835269658e8aad62a7209b49be1ba10251ffa (diff) | |
use absolute paths because of different build possible build directories, ignore latex warnings because of this until a better solution is found
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4538 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | doc/ThornGuide/Makefile | 4 | ||||
| -rw-r--r-- | lib/sbin/ThornGuide.pl | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/ThornGuide/Makefile b/doc/ThornGuide/Makefile index 0d59b299..15374748 100644 --- a/doc/ThornGuide/Makefile +++ b/doc/ThornGuide/Makefile @@ -47,10 +47,10 @@ $(MASTER_FILE).pdf: $(MASTER_FILE).tex -pdflatex $< < /dev/null 2>&1 > LOG_LATEX_FULL_MSGS -pdflatex $< < /dev/null 2>&1 | tee LOG_LATEX_FULL_MSGS | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS if test -e "$@"; then \ - if grep "^\! " "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier"; then \ + if grep "^\! " "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier" | grep -v "You have requested package" ; then \ echo " Problem in $<. See $(DOCBUILDDIR)/LOG_LATEX_* ."; \ exit 1; \ - elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier"; then \ + elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier" | grep -v "You have requested package" ; then \ echo " Warnings in $<. See $(DOCBUILDDIR)/LOG_LATEX_* ."; \ exit 0; \ fi; \ diff --git a/lib/sbin/ThornGuide.pl b/lib/sbin/ThornGuide.pl index 97abd1c4..160a3abf 100644 --- a/lib/sbin/ThornGuide.pl +++ b/lib/sbin/ThornGuide.pl @@ -48,7 +48,10 @@ $cctk_home .= '/' if (($cctk_home !~ /\/$/) && (defined $cctk_home)); # set up the sbin dir, tacking cctk_home on the front my $sbin_dir = "${cctk_home}lib/sbin"; -my $cactus_style_file = "../../../doc/latex/cactus"; +# has to be absolute path because the ThornGuide can be build in different +# directory depths (doc/ThornGuide/build and configs/X/dox/build) +#my $cactus_style_file = "../../../doc/latex/cactus"; +my $cactus_style_file = "${cctk_home}doc/latex/cactus"; ############## # REQUIRE(S) # ############## |