vlc | branch: master | Steve Lhomme <[email protected]> | Mon Feb 29 13:16:48 
2016 +0100| [b4ab9053d40088f63064d7b52545ee548e06593b] | committer: 
Jean-Baptiste Kempf

win32: fix the cygpath test under msys2

The command after the && is not executed when the '-' prefix is there.
All other test failures in the Makefile are using the if/then/fi logic.

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4ab9053d40088f63064d7b52545ee548e06593b
---

 extras/package/win32/package.mak |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 78d6ed5..9e76ded 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -63,7 +63,9 @@ endif
 # The shared DLLs may not necessarily be in the first LIBRARY_PATH, we
 # should check them all.
        -library_path_list=`$(CXX) -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut 
-d= -f2` ;\
-       -cygpath --version >/dev/null 2>/dev/null && 
library_path_list="`cygpath -p $$library_path_list`" ;\
+       if cygpath --version >/dev/null 2>/dev/null; then \
+               library_path_list="`cygpath -p $$library_path_list`" ;\
+       fi; \
        IFS=':' ;\
        for x in $$library_path_list ;\
        do \

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to