[oe-commits] Christopher Larson : git: leverage upstream relocation support

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4fe4b432b7323a73144f317f8bbbd09c9d9fcb77
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4fe4b432b7323a73144f317f8bbbd09c9d9fcb77

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Fri Dec 13 07:50:11 2013 -0700

git: leverage upstream relocation support

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/git/git.inc | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 183a93c..f33069c 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -16,7 +16,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 
 inherit autotools perlnative
 
-EXTRA_OEMAKE = "NO_PYTHON=1"
+EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1"
 
 do_compile_prepend () {
 	# Remove perl/perl.mak to fix the out-of-date perl.mak error
@@ -35,18 +35,6 @@ do_install () {
 	rmdir ${D}${exec_prefix}/lib || true
 }
 
-do_install_append_class-native() {
-	create_wrapper ${D}/${bindir}/git \
-		GIT_EXEC_PATH=${libexecdir}/git-core \
-		GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
-}
-
-do_install_append_class-nativesdk() {
-	create_wrapper ${D}/${bindir}/git \
-		GIT_EXEC_PATH=${libexecdir}/git-core \
-		GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
-}
-
 FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
 FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"