aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLars Hjemli2008-10-11 20:21:17 +0200
committerLars Hjemli2008-10-11 20:21:17 +0200
commit8011587ef34d98398b60be8fcd6c6ecf499c0676 (patch)
treee5b980763fe2c86b52932e959aa8eeeefb6bd44c
parented7ff095ca467cdc4c8a1a1459847d68e50c9b91 (diff)
parentefaccb3d6ab7abc459681e27b6c9b2d8119333eb (diff)
downloadcgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar
cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.gz
cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.zip
Merge branch 'stable'
* stable: Makefile: enable compilation on uclibc
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3ee2a59..3c27422 100644
--- 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)