From f86abbb936908a724be6d4e61e3720fd44b7d956 Mon Sep 17 00:00:00 2001 From: "Keith Burns (alagalah)" Date: Mon, 2 May 2016 10:20:53 -0700 Subject: [PATCH] VPP-33 Removing javah from Makefile. Merged as fix for Gerrit 884 Change-Id: I2d9d6a607ffa1a8788c1ce79770db8b2b9bae6fb Signed-off-by: Keith Burns (alagalah) --- Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile b/Makefile index f4b46f8e34c..53930928059 100644 --- a/Makefile +++ b/Makefile @@ -96,9 +96,6 @@ ifeq ("$(shell lsb_release -si)", "Ubuntu") echo "by executing \"make install-dep\"\n" ; \ exit 1 ; \ fi ; \ - if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \ - sudo update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \ - fi ; \ exit 0 endif @echo "SOURCE_PATH = $(WS_ROOT)" > $(BR)/build-config.mk @@ -124,9 +121,6 @@ install-dep: ifeq ("$(shell lsb_release -si)", "Ubuntu") $(use_ppa_for_jdk8) @sudo apt-get -y install $(DEB_DEPENDS) - if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \ - update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \ - fi ; \ else ifneq ("$(wildcard /etc/redhat-release)","") @sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS) @sudo yum install -y $(RPM_DEPENDS) -- 2.16.6