* Makefile.am: create directories before installing stuff in them.

  * m4/Makefile.am: distribute our generated private.m4 file.

diff --git a/Makefile.am b/Makefile.am
index e7d9fe7c08e868d947e6e4a3f0d151df0fbfdd4a..4edf7e36a3ad3e62055fdd6674c25f5285eed759 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,10 +374,10 @@ endif
 # Install the modules and the symlinks
 install-exec-local:
        for i in "" `$(srcdir)/vlc-config --target plugin` ; do if test -n "$$i" ; then \
-         $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`/" ; \
+         $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
        fi ; done
        for i in "" `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test -n "$$i" ; then \
-         $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc/" ; \
+         $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
        fi ; done
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
@@ -396,8 +396,8 @@ VLC.app: vlc plugins
        $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
        for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
-         if test -n "$$i" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \
-           $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \
+         if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
+           "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
        $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 0ab4afdb0d3aa772348409f33b78aad1da8a8405..56b2a110f076456237c1d00e24e606789f47aee9 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
        lib-ld.m4 \
        lib-link.m4 \
        lib-prefix.m4 \
+       private.m4 \
        progtest.m4 \
        stdint_h.m4 \
        uintmax_t.m4 \