Replace __MGR__ variables

Makefile

@@ -34,10 +34,11 @@ PORTALSKINSDIR=$(PORTALDIR)/skins
 RPORTALSKINSDIR=$(DESTDIR)/$(PORTALSKINSDIR)
 MANAGERDIR=$(DOCUMENTROOT)/manager
 RMANAGERDIR=$(DESTDIR)/$(MANAGERDIR)
-MANAGERSITEDIR=$(MANAGERDIR)/site
+MANAGERSITEDIR=$(MANAGERDIR)
 RMANAGERSITEDIR=$(DESTDIR)/$(MANAGERSITEDIR)
 MANAGERSTATICDIR=$(MANAGERSITEDIR)/static
 RMANAGERSTATICDIR=$(DESTDIR)/$(MANAGERSTATICDIR)
+MANAGERRELATIVESTATICDIR=/static
 MANAGERPSGIDIR=$(MANAGERSITEDIR)/psgi
 RMANAGERPSGIDIR=$(DESTDIR)/$(MANAGERPSGIDIR)
 MANAGERTEMPLATESDIR=$(MANAGERSITEDIR)/templates
@@ -281,6 +282,8 @@ install_site:	install_manager_site install_portal_site install_handler_site inst
 	@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g; \
 			s#__PORTALDIR__#$(PORTALDIR)/#g; \
 			s#__MANAGERDIR__#$(MANAGERDIR)/#g; \
+			s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \
+			s#__MANAGERPSGIDIR__#$(MANAGERPSGIDIR)/#g; \
 			s#__TESTDIR__#$(TESTDIR)/#g; \
 			s#__VHOSTLISTEN__#$(VHOSTLISTEN)#g; \
 			s#__DEFDOCDIR__#$(DEFDOCDIR)/#g; \
@@ -329,7 +332,7 @@ install_manager_site:	install_conf_dir
 	# Clean svn files
 	@rm -rf $$(find ${RMANAGERDIR} ${RMANAGERSTATICDIR} $(RMANAGERPSGIDIR) \
 		$(RMANAGERTEMPLATESDIR) $(RCONFDIR) -type d -name .svn)
-	$(PERL) -i -pe 's#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
+	$(PERL) -i -pe 's#__MANAGERSTATICDIR__#$(MANAGERRELATIVESTATICDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
 	$(PERL) -i -pe 's#__MANAGERTEMPLATESDIR__#$(MANAGERTEMPLATESDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
 
 install_portal_site:	install_conf_dir