X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=53930928059c86250a71c3652b07f69553a9f83d;hb=f86abbb936908a724be6d4e61e3720fd44b7d956;hp=f4b46f8e34ccb354a5b8ac2335b3de1441db2dff;hpb=45a42b5d7f6940fbd93d6b3413c2d943e497a0b1;p=vpp.git 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)