summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorswhite <swhite@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-09-27 12:02:14 +0000
committerswhite <swhite@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-09-27 12:02:14 +0000
commite550a14b85001e57fdd4ee65bfdfb272d0254735 (patch)
tree542edeafb691efff5180ef1f5b16d32d571b4230 /Makefile
parent72ba1ed6294e3904b2f7a491b4a0718efcd0f522 (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 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."; \