From 50d78fde85a6d2cee2e28f3681b4808b69133088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 30 Jan 2015 11:48:29 +0100 Subject: [PATCH] fix install script --- Makefile | 2 +- gyp/common.gypi | 1 - gyp/install.gypi | 101 +++++++--------------- gyp/link.py | 11 +++ utils/mbgl-config/build.sh | 7 +- utils/mbgl-config/mbgl-config.template.sh | 8 +- 6 files changed, 47 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index 3b1bbfcbf..3f2818abe 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ mbgl: build/mbgl/Makefile .PHONY: install install: build/mbgl/Makefile - $(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) install + LINK=`pwd`/gyp/link.py $(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) install .PHONY: standalone standalone: build/mbgl/Makefile diff --git a/gyp/common.gypi b/gyp/common.gypi index 301856c52..7cf13fff6 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -1,7 +1,6 @@ { 'variables': { 'install_prefix%': '', - 'standalone_product_dir':'