Fix Standard Make projects to work

- fix erroneous check in Configuration to use the optionalProps
  variable instead of props
- in ContainerCommandLauncher add the project directory as an
  additional directory so all sources and make macros are
  available to the Container

Change-Id: I13099d246456aa350bebbbae32cc152b3b4598bc

2 files changed, 4 insertions, 1 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index ac7b3f22ae8..03f14a6256c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -264,7 +264,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 			buildProperties = new BuildObjectProperties(props, this, this);
 
 		String optionalProps = SafeStringInterner.safeIntern(element.getAttribute(OPTIONAL_BUILD_PROPERTIES));
-		if(props != null)
+		if(optionalProps != null)
 			optionalBuildProperties = new OptionalBuildProperties(optionalProps);
 
 		String artType = SafeStringInterner.safeIntern(element.getAttribute(BUILD_ARTEFACT_TYPE));
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java
index 660d0baf3d1..0c0020d2cee 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerCommandLauncher.java
@@ -120,6 +120,9 @@ public class ContainerCommandLauncher
 
 		List<String> additionalDirs = new ArrayList<>();
 
+		//
+		additionalDirs.add(fProject.getLocation().toPortableString());
+
 		ArrayList<String> commandSegments = new ArrayList<>();
 
 		StringBuilder b = new StringBuilder();