automake: Directly generate configs/current instead of symlinking from it.

This commit is contained in:
Eric Anholt 2012-06-11 10:49:38 -07:00
parent 95836b46e7
commit 9ff2709ca5
3 changed files with 1 additions and 10 deletions

View File

@ -44,7 +44,6 @@ clean-local:
distclean-local:
-rm -rf lib*
-rm -f $(top_builddir)/configs/current
-rm -f $(top_builddir)/configs/autoconf
-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
-name depend -o -name depend.bak ')' -exec rm -f '{}' ';'

View File

@ -2142,7 +2142,7 @@ CFLAGS="$CFLAGS $USER_CFLAGS"
CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
AC_CONFIG_FILES([configs/current
Makefile
src/Makefile
src/gallium/auxiliary/pipe-loader/Makefile
@ -2183,14 +2183,6 @@ AC_CONFIG_FILES([configs/autoconf
src/mesa/drivers/dri/radeon/Makefile
src/mesa/drivers/dri/swrast/Makefile])
dnl Replace the configs/current symlink
AC_CONFIG_COMMANDS([configs],[
if test -f configs/current || test -L configs/current; then
rm -f configs/current
fi
ln -s autoconf configs/current
])
dnl Sort the dirs alphabetically
GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
GALLIUM_WINSYS_DIRS=`echo $GALLIUM_WINSYS_DIRS|tr " " "\n"|sort -u|tr "\n" " "`