From 7ca3ce91b075668428be26379e9952a6430b9ca1 Mon Sep 17 00:00:00 2001 From: Mark Pulford Date: Tue, 13 Dec 2011 00:05:23 +1030 Subject: Fix RPM build Previously the the RPM build would overwrite CJSON_CFLAGS but didn't provide the necessary default CFLAGS (-fpic -DVERSION ..). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cad06be..26f5253 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ INSTALL_CMD = install ## End platform specific section -CJSON_CFLAGS += -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\" +BUILD_CFLAGS = -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\" $(CJSON_CFLAGS) OBJS := lua_cjson.o strbuf.o .PHONY: all clean install package doc @@ -55,7 +55,7 @@ all: cjson.so doc: manual.html .c.o: - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CJSON_CFLAGS) -o $@ $< + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $< cjson.so: $(OBJS) $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS) -- cgit v1.2.3-55-g6feb