libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh - 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/gmock-1.5.0/nacl-gmock-1.5.0.sh

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/gmock-1.5.0/nacl-gmock-1.5.0.sh

diff --git a/libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh b/libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh

index 8d0e74da02b31e7b6e96d48f853d46c7ac53f329..02a87cbcf057e71b5589e9fb65aff41cb7bf8f01 100755

--- a/libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh

+++ b/libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh

@@ -28,11 +28,11 @@ CustomConfigureStep() {

}

CustomInstallStep() {

- Remove ${NACL_SDK_USR_INCLUDE}/gmock

+ Remove ${NACLPORTS_INCLUDE}/gmock

readonly THIS_PACKAGE_PATH=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}

- (ChangeDir include; tar cf - gmock | (ChangeDir ${NACL_SDK_USR_INCLUDE}; tar xfp -))

- Remove ${NACL_SDK_USR_LIB}/${LIB_GMOCK}

- install -m 644 ${LIB_GMOCK} ${NACL_SDK_USR_LIB}/${LIB_GMOCK}

+ (ChangeDir include; tar cf - gmock | (ChangeDir ${NACLPORTS_INCLUDE}; tar xfp -))

+ Remove ${NACLPORTS_LIBDIR}/${LIB_GMOCK}

+ install -m 644 ${LIB_GMOCK} ${NACLPORTS_LIBDIR}/${LIB_GMOCK}

DefaultTouchStep

}