[[ Gyp ]] Remove references to src_top_dir_abs that crept back in

livecodefraser · livecodefraser · commit af9304a8b921 · 2015-09-03T12:06:13.000+01:00
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -268,7 +268,7 @@
 					{
 						'ldflags':
 						[
-							'-T', '<(src_top_dir_abs)/engine/linux.link',
+							'-T', '$(abs_srcdir)/engine/linux.link',
 						],
 					},
 				],
@@ -525,7 +525,7 @@
 					{
 						'ldflags':
 						[
-							'-T', '<(src_top_dir_abs)/engine/linux.link',
+							'-T', '$(abs_srcdir)/engine/linux.link',
 						],
 					},
 				],
diff --git a/prebuilt/libcurl.gyp b/prebuilt/libcurl.gyp
@@ -40,10 +40,9 @@
 					[
 						'OS == "linux"',
 						{
-							# Gyp doesn't seem to handle non-absolute paths here properly...
 							'library_dirs':
 							[
-								'<(src_top_dir_abs)/prebuilt/lib/linux/<(target_arch)',
+								'lib/linux/<(target_arch)',
 							],
 							
 							'libraries':
diff --git a/prebuilt/libicu.gyp b/prebuilt/libicu.gyp
@@ -156,7 +156,7 @@
 						{
 							'library_dirs':
 							[
-								'<(src_top_dir_abs)/prebuilt/lib/emscripten/js',
+								'lib/emscripten/js',
 							],
 
 							'libraries':

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@`
`268`	`268`	`{`
`269`	`269`	`'ldflags':`
`270`	`270`	`[`
`271`		`- '-T', '<(src_top_dir_abs)/engine/linux.link',`
	`271`	`+ '-T', '$(abs_srcdir)/engine/linux.link',`
`272`	`272`	`],`
`273`	`273`	`},`
`274`	`274`	`],`
`@@ -525,7 +525,7 @@`
`525`	`525`	`{`
`526`	`526`	`'ldflags':`
`527`	`527`	`[`
`528`		`- '-T', '<(src_top_dir_abs)/engine/linux.link',`
	`528`	`+ '-T', '$(abs_srcdir)/engine/linux.link',`
`529`	`529`	`],`
`530`	`530`	`},`
`531`	`531`	`],`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,9 @@`
`40`	`40`	`[`
`41`	`41`	`'OS == "linux"',`
`42`	`42`	`{`
`43`		`- # Gyp doesn't seem to handle non-absolute paths here properly...`
`44`	`43`	`'library_dirs':`
`45`	`44`	`[`
`46`		`- '<(src_top_dir_abs)/prebuilt/lib/linux/<(target_arch)',`
	`45`	`+ 'lib/linux/<(target_arch)',`
`47`	`46`	`],`
`48`	`47`
`49`	`48`	`'libraries':`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@`
`156`	`156`	`{`
`157`	`157`	`'library_dirs':`
`158`	`158`	`[`
`159`		`- '<(src_top_dir_abs)/prebuilt/lib/emscripten/js',`
	`159`	`+ 'lib/emscripten/js',`
`160`	`160`	`],`
`161`	`161`
`162`	`162`	`'libraries':`