MonetDB: Aug2011 - Fix make rule.

[Sjoerd Mullender]

Changeset: a0bfc8b9d785 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0bfc8b9d785
Modified Files:
        NT/rules.msc
Branch: Aug2011
Log Message:

Fix make rule.
Each command in a makefile is executed as a separate command unless
the first line ends in a \, in which case the \ and following newline
are removed.
This means that having a line "if ERRORLEVEL 1 ..." will never do
anything.  Also, the first line, if it fails, will cause nmake to stop
with an error.


diffs (14 lines):

diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -398,8 +398,8 @@ create_winconfig_conds_new_py:
 
 update_winconfig_conds_py: create_winconfig_conds_new_py
        if not exist "$(TOPDIR)\winconfig_conds.py" $(CP) 
"$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
-       C:\cygwin\bin\cmp.exe -s "$(TOPDIR)\winconfig_conds_new.py" 
"$(TOPDIR)\winconfig_conds.py"
-       if ERRORLEVEL 1 $(CP) "$(TOPDIR)\winconfig_conds_new.py" 
"$(TOPDIR)\winconfig_conds.py"
+       C:\cygwin\bin\cmp.exe -s "$(TOPDIR)\winconfig_conds_new.py" 
"$(TOPDIR)\winconfig_conds.py" || \
+       $(CP) "$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
 
 CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
        "$(TOPDIR)\winconfig_conds.py" \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list