- Fix building of vlc-config

  VLC can now be built in a subdirectory

diff --git a/Makefile.am b/Makefile.am
index 252bdc73147d3cba3568bcdb0a576d48d8dd8599..e9609d428bfb6dd5cf99a83cba0703e6349b9ffc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -263,6 +263,10 @@ dist-hook:
 ###############################################################################
 
 bin_SCRIPTS = vlc-config
+CLEANFILES = $(bin_SCRIPTS)
+vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
+       cd $(top_builddir) && $(SHELL) ./config.status --file=$@
+       -cd $(top_builddir) && chmod 0755 $@
 
 lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
 

diff --git a/configure.ac b/configure.ac
index f77ad1a019b7247c926b0380790f38eff1f0c2e3..6183aaab0ede8758664571f9e809e1f358bc1fa0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4282,7 +4282,10 @@ AC_CONFIG_FILES([
   modules/visualization/galaktos/Makefile
 ])
 
-AC_CONFIG_FILES([vlc-config], [chmod 0755 vlc-config])
+# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built,
+# not provided with the source
+${SHELL} ./config.status --file=vlc-config
+chmod 0755 vlc-config
 
 dnl Generate makefiles
 AC_OUTPUT