Merge branch 'stable'

* stable:
  Makefile: enable compilation on uclibc

diff --git a/Makefile b/Makefile
index 3ee2a59e5ddf6018d2bd43ba1d18ea6c1595c360..3c27422f94879c357418811d0fa8e153c35b90aa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,9 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif
 
 cgit: $(OBJECTS) libgit
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)