Commit 2b277f29 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b58b00ae'

* commit 'b58b00ae':
  configure: Separate "ln" command line arguments

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f6fff8e5 b58b00ae
...@@ -2120,7 +2120,7 @@ cxx_default="g++" ...@@ -2120,7 +2120,7 @@ cxx_default="g++"
host_cc_default="gcc" host_cc_default="gcc"
cp_f="cp -f" cp_f="cp -f"
install="install" install="install"
ln_s="ln -sf" ln_s="ln -s -f"
nm_default="nm -g" nm_default="nm -g"
objformat="elf" objformat="elf"
pkg_config_default=pkg-config pkg_config_default=pkg-config
...@@ -3391,7 +3391,6 @@ case $target_os in ...@@ -3391,7 +3391,6 @@ case $target_os in
network_extralibs='-lbsd' network_extralibs='-lbsd'
exeobjs=compat/plan9/main.o exeobjs=compat/plan9/main.o
disable ffserver disable ffserver
ln_s='ln -s -f'
cp_f='cp' cp_f='cp'
;; ;;
none) none)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment