Alexandre Julliard : make_makefiles: Configure substitutions are allowed in the top makefile.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Nov 17 09:57:47 CST 2015


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Nov 17 12:45:14 2015 +0900

make_makefiles: Configure substitutions are allowed in the top makefile.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/make_makefiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/make_makefiles b/tools/make_makefiles
index 78b6dea..e65429f 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -202,7 +202,7 @@ sub parse_makefile($)
 
         if (/\@[A-Z_]+\@/)  # config.status substitution variable
         {
-            die "Configure substitution is not allowed in $file";
+            die "Configure substitution is not allowed in $file" unless $file eq "Makefile";
         }
         if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/)
         {




More information about the wine-cvs mailing list