From e550a14b85001e57fdd4ee65bfdfb272d0254735 Mon Sep 17 00:00:00 2001
From: swhite <swhite@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Tue, 27 Sep 2005 12:02:14 +0000
Subject: Patch application         Tue Aug 23 08:26:52 CDT 2005 
 [Patches] Correctly report ThornGuide log directory As discussed in
 CactusMaint 	Wed, 14 Sep 2005

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4154 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 Makefile                | 6 +++---
 doc/ThornGuide/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 18b793b3..854bf355 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 #
 #
 #   @enddesc
-#   @version $Id: Makefile,v 1.172 2005-09-26 00:09:04 schnetter Exp $
+#   @version $Id: Makefile,v 1.173 2005-09-27 12:02:14 swhite Exp $
 # @@*/
 
 ##################################################################################
@@ -1090,7 +1090,7 @@ ThornGuide:
 	rm -rf $(THORNBUILD);
 	mkdir $(THORNBUILD);
 	cd $(THORNBUILD); \
-	$(MAKE) -f $(DOCDIR)/ThornGuide/Makefile
+	$(MAKE) -f $(DOCDIR)/ThornGuide/Makefile DOCBUILDDIR=doc/ThornGuide/build
 	if test -e "$(THORNBUILD)/ThornGuide.ps"; then \
 	  mv "$(THORNBUILD)/ThornGuide.ps" $(DOCDIR)/ThornGuide.ps; \
 	  echo "  ThornGuide.ps created in doc directory."; \
@@ -1133,7 +1133,7 @@ $(addsuffix -ThornGuide,$(CONFIGURATIONS)):
 	mkdir $(CONFIGBUILDDIR)
 	if test -r $(CONFIGDIR)/ThornList ; then \
 	  cd $(CONFIGBUILDDIR); \
-	  $(MAKE) -f $(DOCDIR)/ThornGuide/Makefile THORNLIST=$(CONFIGDIR)/ThornList MASTER_FILE=$(GUIDENAME); \
+	  $(MAKE) -f $(DOCDIR)/ThornGuide/Makefile THORNLIST=$(CONFIGDIR)/ThornList MASTER_FILE=$(GUIDENAME) DOCBUILDDIR=$(CONFIGBUILDDIR); \
 	  if test -e "$(CONFIGBUILDDIR)/$(GUIDENAME).ps"; then \
 	    mv "$(CONFIGBUILDDIR)/$(GUIDENAME).ps" $(DOCDIR)/$(GUIDENAME).ps; \
 	    echo "  $(GUIDENAME).ps created in doc directory."; \
diff --git a/doc/ThornGuide/Makefile b/doc/ThornGuide/Makefile
index ab7dc677..24f204ab 100644
--- a/doc/ThornGuide/Makefile
+++ b/doc/ThornGuide/Makefile
@@ -57,10 +57,10 @@ $(MASTER_FILE).dvi: $(MASTER_FILE).tex
 	-latex $< < /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"; then            \
-	     echo "  Problem in $<.  See doc/ThornGuide/build/LOG_LATEX_* .";  \
+	     echo "  Problem in $<.  See $(DOCBUILDDIR)/LOG_LATEX_* .";  \
 	     exit 1;                                             \
 	   elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS"; then         \
-	     echo "  Warnings in $<.  See doc/ThornGuide/build/LOG_LATEX_* ."; \
+	     echo "  Warnings in $<.  See $(DOCBUILDDIR)/LOG_LATEX_* ."; \
 	     exit 0;                                             \
 	   fi;                                                    \
 	else                                                     \
-- 
cgit v1.2.3