Alexandre Julliard : configure: Makefile should be generated last.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 92b57312b54277cb67fba60aba5ead2e74ab2375
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=92b57312b54277cb67fba60aba...

Author: Alexandre Julliard 
Date:   Mon Mar 22 20:25:30 2010 +0100

configure: Makefile should be generated last.

---

configure    |    7 ++++---
 configure.ac |    3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 8cdd421..5b48965 100755
--- a/configure
+++ b/configure
@@ -13853,8 +13853,6 @@ esac

ac_config_commands="$ac_config_commands include/stamp-h"

-ac_config_files="$ac_config_files Makefile"
-

ALL_MAKEFILE_DEPENDS="# Makefile dependencies
 Makefile: Makefile.in Make.rules config.status"
@@ -14660,6 +14658,9 @@ wine_fn_config_tool tools/winegcc
 wine_fn_config_tool tools/wmc
 wine_fn_config_tool tools/wrc

+ac_config_files="$ac_config_files Makefile"
+
+
 test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""

cat >confcache <<_ACEOF
@@ -15356,7 +15357,6 @@ do
   case $ac_config_target in
     "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
     "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;;
     "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;;
     "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;;
@@ -15374,6 +15374,7 @@ do
     "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;;
     "dlls/Makeimplib.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makeimplib.rules" ;;
     "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

*) as_fn_error "invalid argument: `$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index bf66934..31c7170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2132,7 +2132,6 @@ dnl **** Generate output files ****
 AH_TOP([#define __WINE_CONFIG_H])

AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
-AC_CONFIG_FILES([Makefile])

WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd)
 WINE_CONFIG_SYMLINK(fonts/marlett.ttf)
@@ -2703,6 +2702,8 @@ WINE_CONFIG_TOOL(tools/wmc)
 WINE_CONFIG_TOOL(tools/wrc)
 dnl End of auto-generated output commands

+AC_CONFIG_FILES([Makefile])
+
 dnl Don't install in bin dir for Windows build
 test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""