diff Makefile @ 1603:767109c48208

rearrange testing setup, make moin.py runnable from toplevel dir
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 03 Oct 2006 00:17:04 +0200
parents dec11b291ba5
children b06ef2a53efa
line wrap: on
line diff
--- a/Makefile	Mon Oct 02 17:41:13 2006 +0200
+++ b/Makefile	Tue Oct 03 00:17:04 2006 +0200
@@ -3,9 +3,9 @@
 #
 
 # location for the wikiconfig.py we use for testing:
-export PYTHONPATH=`pwd`/tests
+export PYTHONPATH=$(PWD)/tests:$(PWD)
 
-testwiki := ./testwiki
+testwiki := ./tests/wiki
 share := ./wiki
 
 all:
@@ -51,7 +51,7 @@
 
 pagepacks:
 	@python tests/maketestwiki.py
-	@MoinMoin/script/moin.py maint mkpagepacks # must NOT use --config-dir or --wiki-url here!
+	@MoinMoin/script/moin.py --config-dir=$(testwiki)/.. maint mkpagepacks
 	cd $(share) ; rm -rf underlay
 	cp -a $(testwiki)/underlay $(share)/