Fix build

Author: vmcj

webapp/Makefile

@@ -14,7 +14,7 @@ copy-bundle-assets:
 # the include paths are broken. We just copy in the data we need
 	-rm -rf public/bundles/nelmioapidoc
 	mkdir -p public/bundles/nelmioapidoc
-	cp -R ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
+	cp -R ../webapp/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
 
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
@@ -46,9 +46,9 @@ install-domserver:
 # Now change all relative symlinks in webapp/public to their correct paths
 	for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \
 		target=$$(readlink $$link) ; \
-		if echo $${target} | grep -q '\.\./\.\./lib/vendor' ; then \
+		if echo $${target} | grep -q '\.\./\.\./webapp/vendor' ; then \
 			rm $$link ; \
-			realtarget=$(domserver_webappdir)vendor$$(echo $${target} | sed 's!^.*\.\./\.\./lib/vendor!!') ; \
+			realtarget=$(domserver_webappdir)vendor$$(echo $${target} | sed 's!^.*\.\./\.\./webapp/vendor!!') ; \
 			ln -s $$realtarget $$link ; \
 		fi \
 	done

webapp/bin/console

@@ -4,11 +4,11 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
-if (!is_file(dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php')) {
+if (!is_file(dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }
 
-require_once dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php';
+require_once dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php';
 require_once dirname(__DIR__) . '/config/load_db_secrets.php';
 
 set_time_limit(0);

webapp/public/index.php

@@ -2,7 +2,7 @@
 
 use App\Kernel;
 
-require_once dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php';
+require_once dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php';
 require_once dirname(__DIR__) . '/config/load_db_secrets.php';
 
 return function (array $context) {