From 5101ad45d61d283d17873a79fdc0da104226d8c4 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Thu, 2 Mar 2017 19:06:50 +0000 Subject: [PATCH] Fix test path (#595) --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5e4fd910f..d66dd9594 100644 --- a/Makefile +++ b/Makefile @@ -374,9 +374,9 @@ prepare_test_server: PORT=$(TESTWEBSERVERPORT) \ FASTCGISOCKDIR=`pwd`/e2e-tests/conf \ PORTALDIR=`pwd`/e2e-tests/conf/portal \ - PORTALSTATICDIR=`pwd`/$(SRCPORTALDIR)/site/htdocs/static \ + PORTALSITEDIR=`pwd`/$(SRCPORTALDIR)/site/htdocs \ MANAGERDIR=`pwd`/e2e-tests/conf/manager \ - MANAGERSTATICDIR=`pwd`/$(SRCMANAGERDIR)/site/htdocs/static \ + MANAGERSITEDIR=`pwd`/$(SRCMANAGERDIR)/site/htdocs \ TESTDIR=`pwd`/e2e-tests/conf/site \ DEFDOCDIR=`pwd`/doc \ FRDOCDIR=`pwd`/po-doc/fr \ @@ -611,8 +611,10 @@ install_webserver_conf: fi @$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g; \ s#__PORTALDIR__#$(PORTALDIR)/#g; \ + s#__PORTALSITEDIR__#$(PORTALSITEDIR)/#g; \ s#__PORTALSTATICDIR__#$(PORTALSTATICDIR)/#g; \ s#__MANAGERDIR__#$(MANAGERDIR)/#g; \ + s#__MANAGERSITEDIR__#$(MANAGERSITEDIR)/#g; \ s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \ s#__TESTDIR__#$(TESTDIR)/#g; \ s#__PORT__#$(PORT)#g; \