libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch - 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: libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

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: libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

diff --git a/libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch b/libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

index d6af4e7116ad30ce6f93fd018641994ce6a09ec0..f7741fcc1e3d36ffe4bc3b4e0e387d1db538e209 100644

--- a/libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

+++ b/libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

@@ -30,8 +30,8 @@ diff -bNaur FreeImage/Makefile.nacl FreeImage-nacl/Makefile.nacl

+include Makefile.srcs

+# General configuration variables:

-+INCDIR ?= $(NACL_SDK_USR_INCLUDE)

-+INSTALLDIR ?= $(NACL_SDK_USR_LIB)

++INCDIR ?= $(NACLPORTS_INCLUDE)

++INSTALLDIR ?= $(NACLPORTS_LIBDIR)

+# Converts cr/lf to just lf

+DOS2UNIX = dos2unix