* configure.ac vlc-config.in.in: Oops, vlc-config needs top_builddir, not
authorSam Hocevar <sam@videolan.org>
Thu, 17 Jul 2003 14:54:26 +0000 (14:54 +0000)
committerSam Hocevar <sam@videolan.org>
Thu, 17 Jul 2003 14:54:26 +0000 (14:54 +0000)
    top_srcdir.

configure.ac
vlc-config.in.in

index b22ca3d..b53f3f8 100644 (file)
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.32 2003/07/17 12:06:10 sam Exp $
+dnl $Id: configure.ac,v 1.33 2003/07/17 14:54:26 sam Exp $
 
 AC_INIT(vlc,0.6.0)
 
@@ -3193,7 +3193,7 @@ AC_SUBST(PLUGIN_PATH)
 dnl
 dnl  Handle substvars that use $(top_srcdir)
 dnl
-VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" \$(top_builddir)/vlc-config"
+VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
 CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
 
index c437224..9353452 100644 (file)
@@ -80,8 +80,8 @@ fi
 if test "@includedir@" != "/usr/include"; then
   includes="-I@includedir@"
 fi
-if test "${top_srcdir}" != ""; then
-  top_srcdir="${top_srcdir}/"
+if test "${top_builddir}" != ""; then
+  top_builddir="${top_builddir}/"
 fi
 cppflags="${includes}"
 libs="-L@libdir@"
@@ -246,7 +246,7 @@ if test "${echo_target}" = yes; then
     for module in `echo "${plugins}"`; do
       register_targets "${module}"
     done
-    for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_plugin "; done
+    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_plugin "; done
     printf '\n'
   fi
   if test "${echo_builtin}" = yes; then
@@ -254,9 +254,9 @@ if test "${echo_target}" = yes; then
       register_targets "${module}"
     done
     if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
     printf '\n'
   fi
@@ -288,9 +288,9 @@ if test "${echo_libs}" = yes; then
       register_flags "${module}"
     done
     if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
   fi
   echo "${libs} ${ldflags}"