* Makefile.am: Recurse into doc/ to install documentation.

  * configure.ac: Removed mention of plugin packetizer_mpegaudio which does
    not exist.

diff --git a/Makefile.am b/Makefile.am
index 7d34ec6d0fa6a10563dd4df2219f803e3062643c..c208b734d6d025ed4540457d5ccf3a72b8363ce7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla share m4
-DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
+SUBDIRS = intl modules po . mozilla share m4 doc
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
 
 EXTRA_DIST = \
        HACKING \

diff --git a/configure.ac b/configure.ac
index 026a3849f6ee589084f587376efe818ce78db4fc..1dbf2ef914c962f266cbcae43846f2e8f86f8642 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.92 2003/10/23 23:00:37 sigmunau Exp $
+dnl $Id: configure.ac,v 1.93 2003/10/24 16:34:30 sam Exp $
 
 AC_INIT(vlc,0.6.3-cvs)
 
@@ -1057,7 +1057,7 @@ if test "${enable_sout}" != "no"
 then
   AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
   AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
-  AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo])
+  AX_ADD_PLUGINS([packetizer_mpegvideo])
   AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
   AX_ADD_PLUGINS([packetizer_copy])
 

diff --git a/debian/vlc.dirs b/debian/vlc.dirs
index 46d13ac3d77b3ea221c6bdd60999e0b897e99abf..c9f5c0751b72173b26e4c0031371b37cefd69b23 100644 (file)
--- a/debian/vlc.dirs
+++ b/debian/vlc.dirs
@@ -13,7 +13,6 @@ usr/lib/vlc/video_filter
 usr/lib/vlc/video_output
 usr/lib/vlc/visualization
 usr/share/doc/vlc
-usr/share/games/fortunes
 usr/share/gnome/apps/Multimedia
 usr/share/pixmaps
 usr/share/vlc