Makefile - Issue 11885025: Allow re-targeting of naclports install

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Makefile

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src

Patch Set: rebase Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Makefile

diff --git a/Makefile b/Makefile

index 077eaefe047ffee20679b9c4c7aadfca37f9d028..7b9d5ce47e6956910af8719a67b7e13cad8bd13a 100644

--- a/Makefile

+++ b/Makefile

@@ -51,18 +51,19 @@ endif

endif

NACL_OUT = out

+NACLPORTS_PREFIX ?= $(NACL_TOOLCHAIN_ROOT)/$(NACL_ARCH)-nacl/usr

NACL_DIRS_BASE = $(NACL_OUT)/tarballs \

$(NACL_OUT)/repository-$(NACL_ARCH) \

- $(NACL_OUT)/publish

-NACL_SDK_USR = $(NACL_TOOLCHAIN_ROOT)/$(NACL_ARCH)-nacl/usr

+ $(NACL_OUT)/publish \

+ $(NACLPORTS_PREFIX)

NACL_DIRS_TO_REMOVE = $(NACL_OUT) \

- $(NACL_SDK_USR) \

+ $(NACLPORTS_PREFIX) \

NACL_DIRS_TO_MAKE = $(NACL_DIRS_BASE) \

- $(NACL_SDK_USR)/include \

- $(NACL_SDK_USR)/lib

+ $(NACLPORTS_PREFIX)/include \

+ $(NACLPORTS_PREFIX)/lib

LIBRARIES = \

libraries/nacl-mounts \

« no previous file with comments | « no previous file | build_tools/common.sh » ('j') | no next file with comments »