[Debbits-commit] [SCM] Git repository for debbits branch, master, updated. f3acf3acfb39aa740ef0c50a9b523b5ae286e7b9

[Ana Beatriz Guerrero ?==?UTF-8?Q?López]

The following commit has been merged in the master branch:
commit f3acf3acfb39aa740ef0c50a9b523b5ae286e7b9
Author: Ana Beatriz Guerrero López <ana at ekaia.org>
Date:   Sun Mar 24 00:06:50 2013 +0100

    Update Makefile to work nicely in master.d.o

diff --git a/Makefile b/Makefile
index eb99679..fe90d45 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,13 @@ PELICANOPTS=-v
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
 OUTPUTDIR=$(BASEDIR)/output
+OUTPUTDIRMASTER=/srv/bits-master.debian.org/htdocs
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 
+# Update pythonpath to use local modules
+export PYTHONPATH=$PYTHONPATH:/srv/bits-master.debian.org/software/lib/python
+
 help:
 	@echo 'Makefile for a pelican Web site                                              '
 	@echo '                                                                             '
@@ -15,8 +19,8 @@ help:
 	@echo '   make html                        (re)generate the web site                '
 	@echo '   make mhtml                       (re)generate the web site in master.d.o  '
 	@echo '   make clean                       remove the generated files               '
-	@echo '   make regenerate                  regenerate files upon modification       '
-	@echo '   make publish                     generate using production settings       '
+	@echo '   make mclean                      remove the generated files in master.d.o '
+#	@echo '   make publish                     generate using production settings       '
 	@echo '                                                                             '
 
 
@@ -31,10 +35,17 @@ clean:
 	touch $(OUTPUTDIR)/.gitkeep
 	rm -f pelicanconf.pyc  publishconf.pyc
 
-regenerate: clean
-	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+mhtml: mclean $(OUTPUTDIRMASTER)/index.html
+	@echo 'Done'
+
+$(OUTPUTDIRMASTER)/%.html:
+	$(PELICANMASTER) $(INPUTDIR) -o $(OUTPUTDIRMASTER) -s $(CONFFILE) $(PELICANOPTS)
+
+mclean:
+	find $(OUTPUTDIRMASTER) -mindepth 1 -delete
+	rm -f pelicanconf.pyc  publishconf.pyc
 
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
-.PHONY: html help clean regenerate publish
+.PHONY: html help clean mhtml mclean publish

-- 
Git repository for debbits