diff options
| author | Mark Pulford <mark@kyne.com.au> | 2011-12-13 00:05:23 +1030 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2011-12-13 00:05:23 +1030 |
| commit | 7ca3ce91b075668428be26379e9952a6430b9ca1 (patch) | |
| tree | be881e7c2effa71c3864ba1dd63a0952b720cbb6 | |
| parent | 71c5dd86f14a73d97e2cb57e81755c4844938697 (diff) | |
| download | lua-cjson-7ca3ce91b075668428be26379e9952a6430b9ca1.tar.gz lua-cjson-7ca3ce91b075668428be26379e9952a6430b9ca1.tar.bz2 lua-cjson-7ca3ce91b075668428be26379e9952a6430b9ca1.zip | |
Fix RPM build
Previously the the RPM build would overwrite CJSON_CFLAGS but didn't
provide the necessary default CFLAGS (-fpic -DVERSION ..).
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -45,7 +45,7 @@ INSTALL_CMD = install | |||
| 45 | 45 | ||
| 46 | ## End platform specific section | 46 | ## End platform specific section |
| 47 | 47 | ||
| 48 | CJSON_CFLAGS += -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\" | 48 | BUILD_CFLAGS = -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\" $(CJSON_CFLAGS) |
| 49 | OBJS := lua_cjson.o strbuf.o | 49 | OBJS := lua_cjson.o strbuf.o |
| 50 | 50 | ||
| 51 | .PHONY: all clean install package doc | 51 | .PHONY: all clean install package doc |
| @@ -55,7 +55,7 @@ all: cjson.so | |||
| 55 | doc: manual.html | 55 | doc: manual.html |
| 56 | 56 | ||
| 57 | .c.o: | 57 | .c.o: |
| 58 | $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CJSON_CFLAGS) -o $@ $< | 58 | $(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $< |
| 59 | 59 | ||
| 60 | cjson.so: $(OBJS) | 60 | cjson.so: $(OBJS) |
| 61 | $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS) | 61 | $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS) |