af5a7265cb
Copy from home:jengelh:branches:multimedia:libs/libvorbis via accept of submit request 28141 revision 7. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/28141 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=8
25 lines
666 B
Plaintext
25 lines
666 B
Plaintext
---
|
|
vorbis.m4 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- vorbis.m4.orig
|
|
+++ vorbis.m4
|
|
@@ -21,7 +21,7 @@
|
|
VORBIS_LIBS=""
|
|
elif test "x$vorbis_prefix" != "x" ; then
|
|
VORBIS_LIBS="-L$vorbis_prefix/lib"
|
|
- elif test "x$prefix" != "xNONE"; then
|
|
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
|
|
VORBIS_LIBS="-L$prefix/lib"
|
|
fi
|
|
|
|
@@ -37,7 +37,7 @@
|
|
VORBIS_CFLAGS=""
|
|
elif test "x$vorbis_prefix" != "x" ; then
|
|
VORBIS_CFLAGS="-I$vorbis_prefix/include"
|
|
- elif test "x$prefix" != "xNONE"; then
|
|
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
|
|
VORBIS_CFLAGS="-I$prefix/include"
|
|
fi
|
|
|