diff options
6 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKUtils.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKUtils.java index 7002293..59ee040 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKUtils.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKUtils.java @@ -229,7 +229,7 @@ public class YoctoSDKUtils { String sKey = (String)iter.next(); String sValue = (String)envMap.get(sKey); //Change certain env vars based on user target sysroot setup - if (sKey.matches("PKG_CONFIG_SYSROOT_DIR") || sKey.matches("POKY_TARGET_SYSROOT")) + if (sKey.matches("PKG_CONFIG_SYSROOT_DIR") || sKey.matches("OECORE_TARGET_SYSROOT")) env.addVariable(sKey, elem.getStrSysrootLoc(), IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); else if (sKey.matches("PKG_CONFIG_PATH")) env.addVariable(sKey, elem.getStrSysrootLoc()+"/usr/lib/pkgconfig", IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); @@ -237,7 +237,7 @@ public class YoctoSDKUtils { env.addVariable(sKey, sValue, IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); } //add ACLOCAL OPTS for libtool 2.4 support - env.addVariable("POKY_ACLOCAL_OPTS", + env.addVariable("OECORE_ACLOCAL_OPTS", "-I " + env.getVariable("OECORE_NATIVE_SYSROOT", ccdesc).getValue() + "/usr/share/aclocal", IEnvironmentVariable.ENVVAR_REPLACE, delimiter, diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/src/autogen.sh b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/src/autogen.sh index b70930f..7fd81e2 100755 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/src/autogen.sh +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/src/autogen.sh @@ -2,7 +2,7 @@ [ -e config.cache ] && rm -f config.cache libtoolize --automake -aclocal ${POKY_ACLOCAL_OPTS} +aclocal ${OECORE_ACLOCAL_OPTS} autoconf autoheader automake -a diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCClutterProject/src/autogen.sh b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCClutterProject/src/autogen.sh index b70930f..7fd81e2 100755 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCClutterProject/src/autogen.sh +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCClutterProject/src/autogen.sh @@ -2,7 +2,7 @@ [ -e config.cache ] && rm -f config.cache libtoolize --automake -aclocal ${POKY_ACLOCAL_OPTS} +aclocal ${OECORE_ACLOCAL_OPTS} autoconf autoheader automake -a diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKProject/src/autogen.sh b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKProject/src/autogen.sh index b70930f..7fd81e2 100755 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKProject/src/autogen.sh +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKProject/src/autogen.sh @@ -2,7 +2,7 @@ [ -e config.cache ] && rm -f config.cache libtoolize --automake -aclocal ${POKY_ACLOCAL_OPTS} +aclocal ${OECORE_ACLOCAL_OPTS} autoconf autoheader automake -a diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/autogen.sh b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/autogen.sh index b70930f..7fd81e2 100755 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/autogen.sh +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/autogen.sh @@ -2,7 +2,7 @@ [ -e config.cache ] && rm -f config.cache libtoolize --automake -aclocal ${POKY_ACLOCAL_OPTS} +aclocal ${OECORE_ACLOCAL_OPTS} autoconf autoheader automake -a diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPClutterProject/src/autogen.sh b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPClutterProject/src/autogen.sh index b70930f..7fd81e2 100755 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPClutterProject/src/autogen.sh +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPClutterProject/src/autogen.sh @@ -2,7 +2,7 @@ [ -e config.cache ] && rm -f config.cache libtoolize --automake -aclocal ${POKY_ACLOCAL_OPTS} +aclocal ${OECORE_ACLOCAL_OPTS} autoconf autoheader automake -a |