configure.ac: fix dvdnav linking on beos/os x/win32 (hacky)

[vlc] / debian / rules

diff --git a/debian/rules b/debian/rules
index fe67feb4b8844f2a626c39deea1a84b2c23f6fe7..f9648e6ba0a9eaf2586b3602926d370006cc07cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
+# debian/rules for the VLC media player - uses debhelper.
 # $Id$
 # based on Joey Hess's one.
 
@@ -39,8 +39,9 @@ CONFIG_FLAGS += \
        --enable-wxwindows \
        --enable-slp \
        --enable-flac \
-       --enable-skins \
+       --disable-skins \
        --disable-basic-skins \
+       --enable-skins2 \
        --enable-freetype \
        --enable-mkv \
        --enable-v4l \
@@ -50,6 +51,9 @@ CONFIG_FLAGS += \
        --enable-livedotcom \
        --enable-libmpeg2 \
        --enable-dts \
+       --enable-fribidi \
+       --enable-cdio \
+       --enable-mod \
        $(NULL)
 
 # These ones are currently shipped with VLC
@@ -191,6 +195,9 @@ install: build
        #cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
        #strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
 
+       rm -Rf debian/vlc/usr/share/vlc/skins
+       ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
+
        # Package: libvlc0-dev
        mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
        mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
@@ -327,16 +334,10 @@ endif
 
        # Package: wxvlc
        mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
-       mv debian/vlc/usr/bin/svlc debian/wxvlc/usr/bin/
        ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
        mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
          debian/wxvlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/lib/vlc/gui/libskins_plugin.so \
-         debian/wxvlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/share/vlc/skins \
-         debian/wxvlc/usr/share/vlc/
        ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
-       ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/svlc.1.gz
 
        # Clean up
        rm -f debian/vlc/$(VIDDIR)/*.png