* Makefile.am:

    + Removed trailing / from directory names.
    + Used dummy instead of "" in the for/do/done loops.
    + Protected a couple of filenames with double quotes.

Makefile.am

@@ -363,23 +363,23 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
 if HAVE_BEOS
 	xres -o $@ $(srcdir)/share/vlc_beos.rsrc
 	mimeset -f $@
-	rm -Rf $(srcdir)/locale ; mkdir $(srcdir)/locale
+	rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale"
 	for i in $(ALL_LINGUAS); do \
-		mkdir -p $(srcdir)/locale/$${i}/LC_MESSAGES ; \
-		cp $(srcdir)/po/$${i}.gmo \
-			$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \
+	  cp "$(srcdir)/po/$${i}.gmo" \
+	    "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
 	done
 endif
 
 # Install the modules and the symlinks
 install-exec-local:
-	for i in dummy `$(srcdir)/vlc-config --target plugin` ; do if test "x$$i" != "xdummy" ; then \
+	for i in "" `$(srcdir)/vlc-config --target plugin` ; do if test -n "$$i" ; then \
 	  $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`/" ; \
 	fi ; done
-	for i in dummy `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test "x$$i" != "xdummy" ; then \
+	for i in "" `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test -n "$$i" ; then \
 	  $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc/" ; \
 	fi ; done
-	for i in dummy $(ALIASES) ; do if test "x$$i" != "xdummy" ; then \
+	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
 	  ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
 	fi ; done
@@ -395,8 +395,8 @@ VLC.app: vlc plugins
 	$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
 	$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
 	$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
-	for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \
-	  if test "x$$i" != "xdummy" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \
+	for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
+	  if test -n "$$i" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \
 	    $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \
 	  fi ; done
 	$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
@@ -443,40 +443,40 @@ builtins_pic: FORCE
 #
 # Check that tmp isn't in the way
 package-win32:
-	@if test -e $(srcdir)/tmp; then \
+	@if test -e "$(srcdir)/tmp"; then \
 	  echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
 	  false; \
 	else \
-		echo "OK."; mkdir $(srcdir)/tmp; \
+	  echo "OK."; mkdir -p "$(srcdir)/tmp"; \
 	fi
 # Create installation script
-	cp $(srcdir)/install-win32 $(srcdir)/tmp/nsi
+	cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
 # Copy relevant files
-	cp $(srcdir)/vlc$(EXEEXT) $(srcdir)/tmp/ 
-	$(STRIP) $(srcdir)/tmp/vlc$(EXEEXT)
-	cp $(srcdir)/INSTALL.win32 $(srcdir)/tmp/INSTALL.txt
-	unix2dos $(srcdir)/tmp/INSTALL.txt
+	cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
+	$(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
+	cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
+	unix2dos "$(srcdir)/tmp/INSTALL.txt"
 	for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
-		do cp $(srcdir)/$$file $(srcdir)/tmp/$${file}.txt ; \
-		unix2dos $(srcdir)/tmp/$${file}.txt ; done
+	  do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
+	  unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
 
-	mkdir $(srcdir)/tmp/plugins
-	for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \
-	  if test "x$$i" != "xdummy" ; then \
-	    $(INSTALL) $(srcdir)/$$i$(LIBEXT) $(srcdir)/tmp/plugins/ ; \
+	mkdir -p "$(srcdir)/tmp/plugins"
+	for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
+	  if test -n "$$i" ; then \
+	    $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
 	  fi ; done
 
-	for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
-		do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+	for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
+	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-	mkdir $(srcdir)/tmp/share
+	mkdir -p "$(srcdir)/tmp/share"
 	cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
 
 	mkdir $(srcdir)/tmp/locale
 	for i in $(ALL_LINGUAS); do \
-		mkdir -p $(srcdir)/tmp/locale/$${i}/LC_MESSAGES ; \
-		cp $(srcdir)/po/$${i}.gmo \
-		   $(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
+	  cp "$(srcdir)/po/$${i}.gmo" \
+	    "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
 	done
 
 	mkdir -p $(srcdir)/tmp/skins/default
@@ -538,16 +538,16 @@ package-beos:
 
 package-macosx:
 # Check that tmp isn't in the way
-	@if test -e $(srcdir)/tmp; then \
+	@if test -e "$(srcdir)/tmp"; then \
 	  echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
 	  false; \
 	else \
-		echo "OK."; mkdir $(srcdir)/tmp; \
+	  echo "OK."; mkdir -p "$(srcdir)/tmp"; \
 	fi
 
 # Copy relevant files 
-	cp -R $(srcdir)/VLC.app $(srcdir)/tmp/
-	cd $(srcdir) && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
+	cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/"
+	cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 
 	$(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*