- merge 3.4

doko42 · doko42 · commit 4ccc1514d070 · 2015-05-06T01:13:31.000+02:00
diff --git a/configure b/configure
@@ -14381,7 +14381,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
 $as_echo "$LDVERSION" >&6; }
 
 
-LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}"
+LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
 
 
 # Check whether right shifting a negative integer extends the sign bit
diff --git a/configure.ac b/configure.ac
@@ -4331,7 +4331,7 @@ AC_MSG_RESULT($LDVERSION)
 
 dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
 AC_SUBST(PY_ENABLE_SHARED)
-LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}"
+LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
 AC_SUBST(LIBPL)
 
 # Check whether right shifting a negative integer extends the sign bit

Original file line number	Diff line number	Diff line change
`@@ -4331,7 +4331,7 @@ AC_MSG_RESULT($LDVERSION)`
`4331`	`4331`
`4332`	`4332`	`dnl define LIBPL after ABIFLAGS and LDVERSION is defined.`
`4333`	`4333`	`AC_SUBST(PY_ENABLE_SHARED)`
`4334`		`-LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}"`
	`4334`	`+LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"`
`4335`	`4335`	`AC_SUBST(LIBPL)`
`4336`	`4336`
`4337`	`4337`	`# Check whether right shifting a negative integer extends the sign bit`