configure: Avoid incorrectly cleaning up symlink targets when running in the source...
authorAlexandre Julliard <julliard@winehq.org>
Fri, 5 Feb 2010 16:24:12 +0000 (17:24 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Fri, 5 Feb 2010 16:24:12 +0000 (17:24 +0100)
aclocal.m4
configure

index 324043578459f4b15a7df5eaac38a2e5a8782b18..357edf87ab0880e780fda0a0daf09a1f93d49801 100644 (file)
@@ -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 ****
index f60272d1e8b90999a2467a8936293c76a4846218..ab9c17b56d319a610d292cd71948188a373e3292 100755 (executable)
--- 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 \\