Merge branch 'stable'

* stable: Makefile: enable compilation on uclibc
17 years ago · 8011587ef3
parent ed7ff095ca efaccb3d6a
commit 8011587ef3
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -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)