about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-10-11 20:21:17 +0200
committerLars Hjemli <hjemli@gmail.com>2008-10-11 20:21:17 +0200
commit8011587ef34d98398b60be8fcd6c6ecf499c0676 (patch)
treee5b980763fe2c86b52932e959aa8eeeefb6bd44c
parentui-snapshot: add dwimmery (diff)
parentMakefile: enable compilation on uclibc (diff)
downloadcgit-pink-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.gz
cgit-pink-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)