Wrong makefile loaded on OS X

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Run make.

What is the expected output? What do you see instead?
Makefile pulls in Makefile.win32 instead of Makefile.linux

What version of the product are you using? On what operating system?
SVN r44 on OS X 10.6.6

Please provide any additional information below.
Needs additional logic instead of just checking if 'uname -s' is Linux.  Darwin 
is what is reported on OS X, and it should be using Makefile.linux as well, 
much more so than Makefile.win32.  Proposed fix below and attached.

Index: Makefile
===================================================================
--- Makefile    (revision 44)
+++ Makefile    (working copy)
@@ -1,7 +1,11 @@

 OS=$(shell uname -s)
 ifeq ($(OS), Linux)
-include Makefile.linux
+    include Makefile.linux
 else
-include Makefile.win32
+    ifeq ($(OS), Darwin)
+        include Makefile.linux
+    else
+        include Makefile.win32
+    endif
 endif

Original issue reported on code.google.com by clifton....@gmail.com on 10 Feb 2011 at 9:29

Attachments:

• makefilefix.diff

[GoogleCodeExporter]

Attached wrong patch.

Original comment by clifton....@gmail.com on 10 Feb 2011 at 9:31

Attachments:

• makefilefix.diff

[GoogleCodeExporter]

Nothing?  Anyone maintaining this who can commit patches?  I rewrote the 
makefile fix to be shorter and fix for all *nix platforms by only loading the 
win32 makefile on Windows.

Original comment by clifton....@gmail.com on 15 Feb 2012 at 11:08

Attachments:

• makefile_fix_v2.diff

[GoogleCodeExporter]

Patch applied to trunk.  Will be included in the next release.  Sorry for the 
delay, and thank you much for the patch!

Original comment by ski...@gmail.com on 26 Jun 2012 at 7:53

• Changed state: Fixed