[vlc-commits] commit: contribs: remove bashism, remove generated link from VCS ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 20:17:05 2010 +0100| [fd45c169cb3d8ae49dbbfb6302fdd40ddc732628] | committer: Rafaël Carré 

contribs: remove bashism, remove generated link from VCS

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

 extras/contrib/Makefile  |    1 -
 extras/contrib/bootstrap |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
deleted file mode 120000
index c7624db..0000000
--- a/extras/contrib/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-/Users/steg/Sources/vlc/extras/contrib/contrib.mak
\ No newline at end of file
diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index f68ae2d..2299fe7 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -355,10 +355,10 @@ case "$DISTRO" in
 esac
 
 # Save passed flags
-EXTRA_CFLAGS+=" $CFLAGS"
-EXTRA_LDFLAGS+=" $LDFLAGS"
-EXTRA_CPPFLAGS+=" $CPPFLAGS"
-EXTRA_CXXFLAGS+=" $CXXFLAGS"
+EXTRA_CFLAGS="$EXTRA_CFLAGS $CFLAGS"
+EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
+EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $CPPFLAGS"
+EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS $CXXFLAGS"
 
 uppercase_distro=`echo "$DISTRO" | tr '[:lower:]' '[:upper:]'`
 add_makefile_cfg "HAVE_${uppercase_distro} = 1"