Changeset 44c059eb11e4c8b072ce422039486cf01015e9eb

Show
Ignore:
Timestamp:
02/05/08 13:59:07 (6 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1202216347 +0000
git-parent:

[5848271894d7102ca6593dd605c5b568b77fb78c]

git-author:
Rafaël Carré <funman@videolan.org> 1202216347 +0000
Message:

Fix VLC{-release}.app generation, make symbolic links to .gmo files in the source tree, not in the build tree

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.am

    rfdf1076 r44c059e  
    415415    done 
    416416    cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ 
    417         cd ../../../ && \ 
     417        cd ../../../../ && \ 
    418418        cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ 
    419419              $(top_builddir)/VLC-release.app; \ 
     
    447447    for i in $(srcdir)/share/http-lua/*.* ; do \ 
    448448      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \ 
    449     done ; \ 
     449    done 
    450450    for i in $(srcdir)/share/http-lua/dialogs/* ; do \ 
    451451      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \ 
    452     done ; \ 
     452    done 
    453453    for i in $(srcdir)/share/http-lua/js/*.* ; do \ 
    454454      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \ 
    455     done ; \ 
     455    done 
    456456    for i in $(srcdir)/share/http-lua/old/*.* ; do \ 
    457457      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \ 
    458     done ; \ 
     458    done 
    459459    for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \ 
    460460      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \ 
    461     done ; \ 
     461    done 
    462462    for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \ 
    463463      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \ 
    464     done ; \ 
     464    done 
    465465    for i in $(srcdir)/share/http-lua/images/*.* ; do \ 
    466466      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \ 
    467     done ; \ 
     467    done 
    468468    for i in $(srcdir)/share/http-lua/requests/*.* ; do \ 
    469469      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \ 
    470     done ; \ 
     470    done 
    471471    $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt 
    472472    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs 
     
    481481    for i in $(srcdir)/share/http/*.* ; do \ 
    482482      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ 
    483     done ; \ 
     483    done 
    484484    for i in $(srcdir)/share/http/dialogs/* ; do \ 
    485485      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \ 
    486     done ; \ 
     486    done 
    487487    for i in $(srcdir)/share/http/js/*.* ; do \ 
    488488      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ 
    489     done ; \ 
     489    done 
    490490    for i in $(srcdir)/share/http/old/*.* ; do \ 
    491491      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ 
    492     done ; \ 
     492    done 
    493493    for i in $(srcdir)/share/http/old/admin/*.* ; do \ 
    494494      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ 
    495     done ; \ 
     495    done 
    496496    for i in $(srcdir)/share/http/old/vlm/*.* ; do \ 
    497497      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ 
    498     done ; \ 
     498    done 
    499499    for i in $(srcdir)/share/http/images/*.* ; do \ 
    500500      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ 
    501     done ; \ 
     501    done 
    502502    for i in $(srcdir)/share/http/requests/*.* ; do \ 
    503503      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \ 
    504     done ; \ 
     504    done 
    505505    $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt 
    506506    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale 
     
    582582    done 
    583583    cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ 
    584         cd ../../../ && \ 
     584        cd ../../../../ && \ 
    585585        cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ 
    586               $(top_builddir)/VLC.app; \ 
     586              $(top_builddir)/VLC.app 
    587587    rm -Rf $(top_builddir)/tmp 
    588588    $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS 
     
    600600    cat $(top_srcdir)/po/LINGUAS | while read i; do \ 
    601601      mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ 
    602       ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
     602      ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
    603603      mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ 
    604604      ln -sf ../English.lproj/InfoPlist.strings \