From f713a69ff924897ee56e957438bbf64b316d4773 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 20 Dec 2012 16:42:33 -0800
Subject: [PATCH] Fix commit id display under MinGW compile

---
 makefile | 4 ++--
 scp.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index 79431873..761acce4 100644
--- a/makefile
+++ b/makefile
@@ -342,10 +342,10 @@ else
     NETWORK_OPT += -DUSE_SHARED
   endif
   ifneq (,$(shell if exist .git-commit-id type .git-commit-id))
-    GIT_COMMIT_ID==$(shell if exist .git-commit-id type .git-commit-id)
+    GIT_COMMIT_ID=$(shell if exist .git-commit-id type .git-commit-id)
   endif
 endif
-CFLAGS_GIT = -DSIM_GIT_COMMIT_ID="$(GIT_COMMIT_ID)"
+CFLAGS_GIT = -DSIM_GIT_COMMIT_ID=\"$(GIT_COMMIT_ID)\"
 ifneq ($(DEBUG),)
   CFLAGS_G = -g -ggdb -g3
   CFLAGS_O = -O0
diff --git a/scp.c b/scp.c
index 57315a24..680f4a12 100644
--- a/scp.c
+++ b/scp.c
@@ -2297,10 +2297,10 @@ if (vdelt)
     fprintf (st, " delta %d", vdelt);
 if (flag)
     fprintf (st, " [%s, %s, %s]", sim_si64, sim_sa64, sim_snet);
-fprintf (st, "\n");
 #if defined(SIM_GIT_COMMIT_ID)
-fprintf (st, "git commit id: %8.8s\n", SIM_GIT_COMMIT_ID);
+fprintf (st, "     git commit id: %8.8s", SIM_GIT_COMMIT_ID);
 #endif
+fprintf (st, "\n");
 return SCPE_OK;
 }