From 81915155a523a5db688ae70c41e354e6914550ca Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@cfl-bs1.lanl.gov>
Date: Sat, 15 May 2010 17:21:47 -0600
Subject: [PATCH] More fixes for cross-compile

---
 Makefile     | 2 +-
 mdwn/mdwn.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7fca8d1..0cdd221 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ install: $(INSTALL_TARGETS)
 	cp -r www/* $(DESTDIR)$(WWW)
 	cp template.html $(DESTDIR)$(LIB)
 
-	install --directory $(VAR)/disabled
+	install --directory $(DESTDIR)$(VAR)/disabled
 
 	$(PYTHON) setup.py install --prefix=$(BASE)
 
diff --git a/mdwn/mdwn.mk b/mdwn/mdwn.mk
index c08923a..6967be2 100644
--- a/mdwn/mdwn.mk
+++ b/mdwn/mdwn.mk
@@ -4,13 +4,13 @@ MDWN_SRC += $(wildcard $(MDWN_DIR)/src/*.mdwn)
 MDWN_SRC += $(wildcard $(MDWN_DIR)/src/*/*.mdwn)
 MDWN_SRC += $(wildcard $(MDWN_DIR)/src/*/*/*.mdwn)
 
-MDWN_OUT = $(subst $(MDWN_DIR)/src/, $(WWW)/, $(MDWN_SRC:.mdwn=.html))
+MDWN_OUT = $(subst $(MDWN_DIR)/src/, $(DESTDIR)$(WWW)/, $(MDWN_SRC:.mdwn=.html))
 
 mdwn:
 
 mdwn-install: $(MDWN_OUT)
 
-$(WWW)/%.html: $(MDWN_DIR)/src/%.mdwn
+$(DESTDIR)$(WWW)/%.html: $(MDWN_DIR)/src/%.mdwn
 	install -d $(@D)
 	$(MDWNTOHTML) $< $@