2003/02/28 03:19:33

darcs-hash:20040130065600-2ba56-d3012adc51101e5cd6d15a63af1345554c698ac5.gz

diff --git a/Makefile b/Makefile
index 6f95c14..4e361a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -152,23 +152,22 @@ current_build         := $(shell cat next.build)
 
 dist:
        # this will fail if we haven't checked-in since the comment is null; we want this.
-#      cvs commit -m '' > /dev/null
+       cvs commit -m '' > /dev/null
 
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
-       (test `uname -n` = gosset.megacz.com) || \
+        ifeq ($(shell uname -n),gosset.megacz.com)
+               (make $(silent) dist-private 2>&1) >> .make-dist.out || \
+                       (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
+               tail -n 200 .make-dist.out | \
+                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
+        elsif
                ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
                        | grep -v "make...:.\(Entering\|Leaving\).directory"
+        endif
 
-       (test `uname -n` = gosset.megacz.com) && \
-               (((make $(silent) dist-private 2>&1) >> .make-dist.out) || \
-                       (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false))
-
-       (test `uname -n` = gosset.megacz.com) && \
-               (tail -n 200 .make-dist.out | \
-                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null)
 
 dist-private:
        make $(silent) update-build