Changeset bcca390d4441aac7c53e60b457e17bb4af8f6f71

Show
Ignore:
Timestamp:
02/03/08 15:02:07 (7 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1202047327 +0000
git-parent:

[4fb40a4b1dff58b216ddff79fe2535054dfaa18e]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1202047327 +0000
Message:

Cosmetic: Use $(...) rather than ${...} for variable expansion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r47d3ba0 rbcca390  
    638638package-win-common: 
    639639# Check that tmp isn't in the way 
    640     @if test -e "$(top_builddir)/vlc-${VERSION}"; then \ 
    641       echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \ 
     640    @if test -e "$(top_builddir)/vlc-$(VERSION)"; then \ 
     641      echo "Error: please remove $(top_builddir)/vlc-$(VERSION), it is in the way"; \ 
    642642      false; \ 
    643643    else \ 
    644       echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ 
     644      echo "OK."; mkdir -p "$(top_builddir)/vlc-$(VERSION)"; \ 
    645645    fi 
    646646 
    647647# Copy relevant files 
    648     cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" 
    649     cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" 
    650     cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/" 
    651     cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/" 
     648    cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" 
     649    cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" 
     650    cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" 
     651    cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/" 
    652652 
    653653    for file in AUTHORS MAINTAINERS THANKS ; \ 
    654       do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done; 
     654      do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done; 
    655655    for file in NEWS COPYING README; \ 
    656        do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-${VERSION}/$${file}.txt"; done 
    657       unix2dos "$(top_builddir)/vlc-${VERSION}/"*.txt 
    658  
    659     mkdir $(top_builddir)/vlc-${VERSION}/locale 
     656       do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done 
     657      unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt 
     658 
     659    mkdir $(top_builddir)/vlc-$(VERSION)/locale 
    660660    cat $(top_srcdir)/po/LINGUAS | while read i; do \ 
    661       mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ 
     661      mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \ 
    662662      cp "$(srcdir)/po/$${i}.gmo" \ 
    663         "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ 
     663        "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \ 
    664664            || true ; \ 
    665665    done 
    666666 
    667     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/images" 
    668     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/requests" 
    669     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/js" 
    670     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/dialogs" 
    671     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old" 
    672     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/vlm" 
    673     mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/admin" 
    674     cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-${VERSION}/http-lua/ ; 
    675     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.html ; 
    676     cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/ ; 
    677     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/.hosts ; 
    678     cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-${VERSION}/http-lua/ ; 
    679     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.css ; 
    680     cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-${VERSION}/http-lua/js/ ; 
    681     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/js/*.js ; 
    682     cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ; 
    683     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/* ; 
    684     cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ; 
    685     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/.hosts ; 
    686     cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-${VERSION}/http-lua/ ; 
    687     cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-${VERSION}/http-lua/images/ 
    688     cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-${VERSION}/http-lua/requests/ ; 
    689     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/*.xml ; 
    690     cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ; 
    691     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ; 
    692  
    693     cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; 
    694     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/*.html ; 
    695     cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; 
    696     cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; 
    697     cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; 
    698     cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/ ; 
    699     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/*.html ; 
    700     cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ; 
    701     unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/*.html ; 
    702     cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ; 
    703  
    704     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" 
    705     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" 
    706     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" 
    707     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs" 
    708     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old" 
    709     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm" 
    710     mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" 
    711     cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; 
    712     unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; 
    713     cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ; 
    714     unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ; 
    715     cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; 
    716     unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; 
    717     cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; 
    718     unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; 
    719     cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; 
    720     unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; 
    721     cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; 
    722     unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ; 
    723     cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; 
    724     cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ 
    725     cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; 
    726     unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; 
    727     cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; 
    728     unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; 
    729  
    730     cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; 
    731     unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; 
    732     cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; 
    733     cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ; 
    734     cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; 
    735     cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; 
    736     unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; 
    737     cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; 
    738     unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; 
    739     cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; 
    740  
    741     cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; 
     667    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images" 
     668    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests" 
     669    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js" 
     670    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs" 
     671    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old" 
     672    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm" 
     673    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin" 
     674    cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ; 
     675    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ; 
     676    cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ; 
     677    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ; 
     678    cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ; 
     679    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ; 
     680    cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ; 
     681    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ; 
     682    cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ; 
     683    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ; 
     684    cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ; 
     685    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ; 
     686    cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ; 
     687    cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/ 
     688    cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ; 
     689    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ; 
     690    cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ; 
     691    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ; 
     692 
     693    cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; 
     694    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ; 
     695    cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; 
     696    cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; 
     697    cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; 
     698    cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ; 
     699    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ; 
     700    cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ; 
     701    unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ; 
     702    cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ; 
     703 
     704    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images" 
     705    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests" 
     706    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js" 
     707    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/dialogs" 
     708    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old" 
     709    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/vlm" 
     710    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/admin" 
     711    cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/http/ ; 
     712    unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.html ; 
     713    cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/http/ ; 
     714    unix2dos $(top_builddir)/vlc-$(VERSION)/http/.hosts ; 
     715    cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/http/ ; 
     716    unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.css ; 
     717    cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/http/js/ ; 
     718    unix2dos $(top_builddir)/vlc-$(VERSION)/http/js/*.js ; 
     719    cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/http/dialogs/ ; 
     720    unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/* ; 
     721    cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http/dialogs/ ; 
     722    unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/.hosts ; 
     723    cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/http/ ; 
     724    cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/http/images/ 
     725    cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http/requests/ ; 
     726    unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/*.xml ; 
     727    cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt ; 
     728    unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt ; 
     729 
     730    cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/http/old/ ; 
     731    unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/*.html ; 
     732    cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/http/old/ ; 
     733    cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/http/old/ ; 
     734    cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/http/old/ ; 
     735    cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http/old/vlm/ ; 
     736    unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/vlm/*.html ; 
     737    cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ; 
     738    unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html ; 
     739    cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ; 
     740 
     741    cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ ; 
    742742 
    743743if BUILD_MOZILLA 
    744     mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" 
    745     cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; 
     744    mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla" 
     745    cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ; 
    746746endif 
    747747 
    748748if BUILD_ACTIVEX 
    749     mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" 
    750     cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ; 
    751     cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ; 
    752     unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; 
    753  
    754     cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; 
     749    mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex" 
     750    cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-$(VERSION)/activex/ ; 
     751    cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ; 
     752    unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ; 
     753 
     754    cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ; 
    755755endif 
    756756# Rebase all those DLLs to speed up loading (need cygwin rebase) 
    757757    if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ 
    758         find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ 
     758        find $(top_builddir)/vlc-$(VERSION) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ 
    759759    fi 
    760760 
    761761package-win-common-strip: 
    762     $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" 
    763     $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" 
    764     $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)" 
     762    $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)" 
     763    $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" 
     764    $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)" 
    765765if BUILD_MOZILLA 
    766     $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); 
     766    $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); 
    767767endif 
    768768if BUILD_ACTIVEX 
    769     $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT); 
     769    $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT); 
    770770endif 
    771771 
    772772package-win32-base-debug: package-win-common 
    773773# Copy relevant files 
    774     cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" 
    775  
    776     mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" 
     774    cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" 
     775 
     776    mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins" 
    777777    for i in "" `$(VLC_CONFIG) --target plugin` ; do \ 
    778778      if test -n "$$i" ; then \ 
    779779        $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ 
    780             "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ 
     780            "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \ 
    781781      fi ; done 
    782782 
    783     mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts 
     783    mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts 
    784784    for i in $(srcdir)/share/skins2/fonts/*.*; do \ 
    785       cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \ 
     785      cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \ 
    786786    done 
    787787    for i in $(srcdir)/share/skins2/*.*; do \ 
    788       cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ 
    789     done 
    790  
    791     $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist 
     788      cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \ 
     789    done 
     790 
     791    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist 
    792792    for i in $(srcdir)/share/luaplaylist/*.* ; do \ 
    793       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \ 
     793      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \ 
    794794    done ; 
    795     $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta 
     795    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta 
    796796    for i in $(srcdir)/share/luameta/*.* ; do \ 
    797       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \ 
     797      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \ 
    798798    done ; 
    799     $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf 
     799    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf 
    800800    for i in $(srcdir)/share/luaintf/*.* ; do \ 
    801       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/`basename $${i}` ; \ 
     801      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \ 
    802802    done ; 
    803     $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf/modules 
     803    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules 
    804804    for i in $(srcdir)/share/luaintf/modules/*.* ; do \ 
    805       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/modules/`basename $${i}` ; \ 
     805      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \ 
    806806    done ; 
    807807 
    808     mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu" 
    809     cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu" 
     808    mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu" 
     809    cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu" 
    810810    for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ 
    811         mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \ 
     811        mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \ 
    812812        for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \ 
    813              cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \ 
     813             cp $$file "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir" || true; \ 
    814814        done; \ 
    815815    done 
    816     unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; 
    817     for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \ 
     816    unix2dos $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; 
     817    for file in $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; do \ 
    818818        if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \ 
    819819        if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \ 
    …… 
    823823 
    824824package-win32-base: package-win32-base-debug package-win-common-strip 
    825     for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ 
     825    for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \ 
    826826      do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done 
    827827 
    …… 
    829829# Create package 
    830830    if makensis -VERSION >/dev/null 2>&1; then \ 
    831         MAKENSIS="makensis -DVERSION=${VERSION}"; \ 
     831        MAKENSIS="makensis -DVERSION=$(VERSION)"; \ 
    832832    elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ 
    833         MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \ 
    834     elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \ 
    835         MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \ 
     833        MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \ 
     834    elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ 
     835        MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \ 
    836836    elif wine --version >/dev/null 2>&1; then \ 
    837         MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \ 
     837        MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \ 
    838838    else \ 
    839839        echo 'Error: cannot locate makensis tool'; exit 1; \ 
    840840    fi; \ 
    841     eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi" 
     841    eval "$$MAKENSIS $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi" 
    842842 
    843843package-win32-base-exe-cygwin: package-win32-base-exe 
    …… 
    846846package-win32-base-exe-linux: 
    847847# Create package 
    848     makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi 
     848    makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi 
    849849 
    850850package-win32-base-zip: package-win32-base 
    851851# Create package  
    852     zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION} 
     852    zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) 
    853853 
    854854package-win32-base-7zip: package-win32-base 
    855855# Create package  
    856     7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-${VERSION}-win32.7z vlc-${VERSION} 
     856    7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION) 
    857857 
    858858package-win32-exe: package-win32-base package-win32-base-exe 
    859859# Clean up 
    860     rm -Rf $(top_builddir)/vlc-${VERSION} 
     860    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    861861 
    862862package-win32-exe-linux: package-win32-base package-win32-base-exe-linux 
    863863# Clean up 
    864     rm -Rf $(top_builddir)/vlc-${VERSION} 
     864    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    865865 
    866866package-win32-zip: package-win32-base-zip 
    867867# Clean up 
    868     rm -Rf $(top_builddir)/vlc-${VERSION} 
     868    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    869869 
    870870package-win32-7zip: package-win32-base-7zip 
    871871# Clean up 
    872     rm -Rf $(top_builddir)/vlc-${VERSION} 
     872    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    873873 
    874874package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip 
    …… 
    876876package-win32: package-win32-no-clean 
    877877# Clean up 
    878     rm -Rf $(top_builddir)/vlc-${VERSION} 
     878    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    879879 
    880880package-wince-base: package-win-common package-win-common-strip 
    …… 
    882882package-wince-base-zip: 
    883883# Create package  
    884     zip -r vlc-${VERSION}-wince.zip vlc-${VERSION} 
     884    zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION) 
    885885 
    886886package-wince: package-wince-base  package-wince-base-zip 
    887887# Clean up 
    888     rm -Rf $(top_builddir)/vlc-${VERSION} 
     888    rm -Rf $(top_builddir)/vlc-$(VERSION) 
    889889 
    890890 
    …… 
    906906    xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; 
    907907    find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; 
    908     mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; 
    909     (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) 
    910     mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; 
    911     mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; 
     908    mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) ; 
     909    (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) ) 
     910    mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ ; 
     911    mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc ; 
    912912 
    913913# Create normal package 
    …… 
    917917    xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; 
    918918    find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; 
    919     mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; 
    920     (cd $(srcdir)/tmp &&  zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) 
    921     mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; 
     919    mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) ; 
     920    (cd $(srcdir)/tmp &&  zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) ) 
     921    mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ ; 
    922922 
    923923# Clean up 
    …… 
    926926package-macosx: 
    927927# Check that the temporary location isn't in the way 
    928     @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \ 
    929       rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \ 
     928    @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \ 
     929      rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \ 
    930930    fi 
    931931 
    932     echo "Create package directory: vlc-${VERSION}/"; 
    933     mkdir -p "$(top_builddir)/vlc-${VERSION}/"; 
     932    echo "Create package directory: vlc-$(VERSION)/"; 
     933    mkdir -p "$(top_builddir)/vlc-$(VERSION)/"; 
    934934 
    935935# Copy relevant files  
    936936    @if test -e "$(top_builddir)/VLC-release.app/"; then \ 
    937       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ 
     937      cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ 
    938938    else \ 
    939       cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ 
     939      cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ 
    940940    fi 
    941     cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-${VERSION}/Goodies/ && \ 
    942           mkdir -p $(top_builddir)/vlc-${VERSION}/.background/ && \ 
    943           cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-${VERSION}/Goodies/ && \ 
    944           cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/Goodies/Delete\ VLC\ Preferences.app && \ 
    945       cp README.MacOSX.rtf $(top_builddir)/vlc-${VERSION}/Read\ Me.rtf && \ 
    946       cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-${VERSION}/.background/background.png ; 
     941    cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ 
     942          mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ 
     943          cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ 
     944          cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ 
     945      cp README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ 
     946      cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ; 
    947947 
    948948# Place a link to the application folder 
    949     ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ; 
     949    ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications ; 
    950950 
    951951# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs) 
    952952    echo "Creating disk image" ; 
    953     rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; 
    954     hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \ 
    955       "$(top_builddir)/vlc-${VERSION}.dmg" -scrub ; 
     953    rm -f "$(top_builddir)/vlc-$(VERSION).dmg" ; 
     954    hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ 
     955      "$(top_builddir)/vlc-$(VERSION).dmg" -scrub ; 
    956956    echo "Disk image creation completed:" ; 
    957     ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; 
     957    ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo ; 
    958958 
    959959# Create disk image  
    960960#   echo "Creating disk image" ; 
    961 #   rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; 
    962 #   hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \ 
    963 #     "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \ 
     961#   rm -f "$(top_builddir)/vlc-$(VERSION).dmg" ; 
     962#   hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ 
     963#     "$(top_builddir)/vlc-$(VERSION).dmg" -format UDRW \ 
    964964#     -scrub -imagekey zlib-level=9 -attach ; 
    965965 
    …… 
    969969#   echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ; 
    970970#   mkdir -p $(top_builddir)/vlcmnt ; 
    971 #   hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; 
    972 #   bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; 
     971#   hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-$(VERSION).dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; 
     972#   bless --folder "$(top_builddir)/vlcmnt/vlc-$(VERSION)/" --openfolder "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; 
    973973#   sleep 1 # Make sure operation completes 
    974974#   cd "$(srcdir)" 
    975975 
    976976# Unmount the image now 
    977 #   hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; 
     977#   hdiutil detach "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; 
    978978#   rm -R $(top_builddir)/vlcmnt ; 
    979979 
    …… 
    981981# Note: We can't directly create a read only dmg as we do the bless stuff 
    982982    echo "Make the disk image read-only" ; 
    983     mv "$(top_builddir)/vlc-${VERSION}.dmg" "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; 
    984     hdiutil convert "$(top_builddir)/vlc-${VERSION}-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-${VERSION}.dmg" ; 
    985     rm "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; 
     983    mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ; 
     984    hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" ; 
     985    rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ; 
    986986 
    987987# We are done 
    988988    echo "Disk image creation completed:" ; 
    989     ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; 
     989    ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo ; 
    990990 
    991991# Clean up 
    992     rm -Rf "$(top_builddir)/vlc-${VERSION}" ; 
     992    rm -Rf "$(top_builddir)/vlc-$(VERSION)" ; 
    993993 
    994994package-macosx-plugin: 
    …… 
    10061006 
    10071007# Create disk image  
    1008     rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true 
    1009     rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true 
    1010     mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/" 
    1011     mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/" 
    1012     hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \ 
    1013       "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \ 
     1008    rm -f "$(top_builddir)/vlc-plugin-$(VERSION).dmg"; true 
     1009    rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)/"; true 
     1010    mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/" 
     1011    mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/" 
     1012    hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \ 
     1013      "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \ 
    10141014      -scrub -imagekey zlib-level=9 ; 
    10151015    echo "Disk image creation completed:" 
    1016     rm -rf "$(top_builddir)/vlc-plugin-${VERSION}" 
     1016    rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" 
    10171017endif 
    10181018 
    10191019package-translations: 
    1020     @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ 
    1021       echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \ 
     1020    @if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \ 
     1021      echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \ 
    10221022      false; \ 
    10231023    else \ 
    1024       echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \ 
     1024      echo "OK."; mkdir -p "$(srcdir)/vlc-translations-$(VERSION)"; \ 
    10251025    fi 
    10261026# Copy translations 
    10271027    cat $(top_srcdir)/po/LINGUAS | while read i; do \ 
    10281028      cp "$(srcdir)/po/$${i}.po" \ 
    1029         "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \ 
     1029        "$(srcdir)/vlc-translations-$(VERSION)/$${i}.po" \ 
    10301030        || true ; \ 
    10311031    done 
    10321032    cp "$(srcdir)/doc/translations.txt" \ 
    1033       "$(srcdir)/vlc-translations-${VERSION}/README.txt" 
     1033      "$(srcdir)/vlc-translations-$(VERSION)/README.txt" 
    10341034 
    10351035    echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"