From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 11 Oct 2008 18:21:17 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/8011587ef34d98398b60be8fcd6c6ecf499c0676?hp=ed7ff095ca467cdc4c8a1a1459847d68e50c9b91

Merge branch 'stable'

* stable:
  Makefile: enable compilation on uclibc
---

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)