Alexandre Julliard : configure: Avoid incorrectly cleaning up symlink targets when running in the source dir .
Alexandre Julliard
julliard at winehq.org
Fri Feb 5 11:37:50 CST 2010
Module: wine
Branch: master
Commit: 9acf1d18ce8904830f19c5987e4324b8dc81f6db
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acf1d18ce8904830f19c5987e4324b8dc81f6db
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 5 17:24:12 2010 +0100
configure: Avoid incorrectly cleaning up symlink targets when running in the source dir.
---
aclocal.m4 | 2 +-
configure | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 3240435..357edf8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -147,7 +147,7 @@ dnl
dnl Usage: WINE_CONFIG_SYMLINK(name,target)
dnl
AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+m4_if([$2],,[test "$srcdir" = "." || ])ALL_SYMLINKS="$ALL_SYMLINKS \\
$1"])
dnl **** Create a make rules file from config.status ****
diff --git a/configure b/configure
index f60272d..ab9c17b 100755
--- a/configure
+++ b/configure
@@ -13686,19 +13686,19 @@ ac_config_commands="$ac_config_commands include/stamp-h"
ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\
dlls/wineps.drv/generic.ppd"
ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf"
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\
fonts/marlett.ttf"
ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf"
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\
fonts/symbol.ttf"
ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf"
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\
fonts/tahoma.ttf"
ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf"
-ALL_SYMLINKS="$ALL_SYMLINKS \\
+test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\
fonts/tahomabd.ttf"
ac_config_links="$ac_config_links wine:tools/winewrapper"
ALL_SYMLINKS="$ALL_SYMLINKS \\
More information about the wine-cvs
mailing list