Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 09bb0853fb42e6b82851d586583587538993c6f4..a34dda02cf81c516c0e89fee5d722cba2cb7d20c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,11 +11,12 @@ EXTRA_DIST = extras/COPYING \
        libvlc.pc.in \
        vlc-plugin.pc.in \
        libvlc.sym \
-       libvlccore.sym
+       libvlccore.sym \
+       ../include/vlc/libvlc_version.h.in
 
 BUILT_SOURCES = \
        $(nodist_pkginclude_HEADERS) \
-       ../include/vlc_about.h
+       $(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -114,6 +115,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_xml.h \
        ../include/vlc_xlib.h \
        $(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
        ../include/vlc_codec_synchro.h \
@@ -136,7 +138,8 @@ noinst_HEADERS = \
        $(NULL)
 
 ../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
-       $(SHELL) $(top_builddir)/config.status --file=$@
+       $(AM_V_GEN)cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
        $(AM_V_at)rm -f -- "$@.tmp"