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) $< $@