don't move the file to itself in AC_OUTPUT, this allows to run config.status after...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index d2e5edc1a5d8910f71d7bc08110c8d50a07d0715..9361d3d29a1887696e475ab941ac5f24f604f087 100755 (executable)
--- a/configure
+++ b/configure
@@ -16443,9 +16443,11 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 

-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_NAME}-config
-            ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+                                    if test ! -f wx${TOOLKIT_NAME}-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLKIT_NAME}-config
+                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            fi

 
                         
             if test ! -d lib; then
 
                         
             if test ! -d lib; then

diff --git a/configure.in b/configure.in
index 9278311d15b409de3d36177f413b90f0f0d9831c..819e4adad37fb1a9666ee3d78f63f19aa8b58f5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4292,9 +4292,13 @@ AC_OUTPUT([
             Makefile
           ],
           [
             Makefile
           ],
           [

-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_NAME}-config
-            ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            dnl avoid to move the file again after we had already made it a
+            dnl link (moving the file to itself won't work anyhow)
+            if test ! -f wx${TOOLKIT_NAME}-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLKIT_NAME}-config
+                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            fi

 
             dnl the debian build process wants setup.h in the lib subdir so we
             dnl can pretend wxWin is already installed, so we *copy* it there
 
             dnl the debian build process wants setup.h in the lib subdir so we
             dnl can pretend wxWin is already installed, so we *copy* it there