Changeset e837e05eb2ca96ba81f6b83c9c7e01aaf43107fa

Show
Ignore:
Timestamp:
04/06/08 07:16:48 (5 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1207459008 -0700
git-parent:

[35bb5df5bfa263b9865b8b8c9675b39fd08d7f9c]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1207459008 -0700
Message:

Lua Scripts on Windows have to go to scripts/ and not share/lua since no share/ is used on windows.
This doesn't fix it completely yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.am

    r3aa3031 re837e05  
    737737package-win32-base-debug: package-win-common 
    738738# Copy relevant files 
     739# Script installer 
    739740    cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" 
    740741 
     742# Plugins 
    741743    mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins" 
    742744    for i in "" `$(VLC_CONFIG) --target plugin` ; do \ 
     
    746748      fi ; done 
    747749 
     750# Skins 
    748751    mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts 
    749752    for i in $(srcdir)/share/skins2/fonts/*.*; do \ 
     
    754757    done 
    755758 
    756     $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist 
     759#Lua Scripts 
     760    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist 
    757761    for i in $(srcdir)/share/lua/playlist/*.* ; do \ 
    758       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \ 
     762      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/playlist/`basename $${i}` ; \ 
    759763    done ; 
    760     $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta 
     764    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta 
    761765    for i in $(srcdir)/share/lua/meta/*.* ; do \ 
    762       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \ 
     766      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \ 
    763767    done ; 
    764     $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf 
     768    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf 
    765769    for i in $(srcdir)/share/lua/intf/*.* ; do \ 
    766       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \ 
     770      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \ 
    767771    done ; 
    768     $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules 
     772    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules 
    769773    for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ 
    770       $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \ 
     774      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \ 
    771775    done ; 
    772776 
     777#OSD Menu 
    773778    mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu" 
    774779    cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu" 
  • extras/package/win32/vlc.win32.nsi.in

    r35bb5df re837e05  
    400400  !insertmacro InstallFolder skins 
    401401  !insertmacro InstallFolder http 
    402   !insertmacro InstallFolder share 
    403   ;!insertmacro InstallFolder scripts 
     402  ;!insertmacro InstallFolder share 
     403  !insertmacro InstallFolder scripts 
    404404 
    405405  ; URLs