From 6a8c434e38f3035d04bf17696353cf0bb93abec6 Mon Sep 17 00:00:00 2001
From: Mark Pulford <mark@kyne.com.au>
Date: Sun, 19 Feb 2012 01:28:17 +1030
Subject: Work around Solaris make limitations

Remove ?= and := assignment operators from the Makefile since
they are not supported by Solaris make.
---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 931a2a3..377952f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ LUA_BIN_DIR =       $(PREFIX)/bin
 #CJSON_LDFLAGS =     -bundle -undefined dynamic_lookup
 
 ## Solaris
+#CC           =      gcc
 #CJSON_CFLAGS =      -fpic -DUSE_INTERNAL_ISINF
 
 ## Windows (MinGW)
@@ -49,9 +50,12 @@ LUA_BIN_DIR =       $(PREFIX)/bin
 #CJSON_LDFLAGS =     -shared -L$(PREFIX)/lib -llua51
 #LUA_BIN_SUFFIX =    .lua
 
-##### Use built in number conversion (optional) #####
+##### Number conversion configuration #####
 
-## Enable built in number conversion
+## Use Libc support for number conversion (default)
+FPCONV_OBJS =       fpconv.o
+
+## Use built in number conversion
 #FPCONV_OBJS =       g_fmt.o dtoa.o
 #CJSON_CFLAGS +=     -DUSE_INTERNAL_FPCONV
 
@@ -72,11 +76,10 @@ TEST_FILES =        README bench.lua genutf8.pl test.lua octets-escaped.dat \
 DATAPERM =          644
 EXECPERM =          755
 
-ASCIIDOC ?=         asciidoc
+ASCIIDOC =          asciidoc
 
 BUILD_CFLAGS =      -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS)
-FPCONV_OBJS ?=      fpconv.o
-OBJS :=             lua_cjson.o strbuf.o $(FPCONV_OBJS)
+OBJS =              lua_cjson.o strbuf.o $(FPCONV_OBJS)
 
 .PHONY: all clean install install-extra doc
 
-- 
cgit v1.2.3-55-g6feb