summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2012-03-18 21:02:37 +0000
committerLars Hjemli <hjemli@gmail.com>2012-03-18 21:02:37 +0000
commit2d1c80df0a2576cdacc7f72c295b66c95565c1e8 (patch)
tree1e310322f68c56953f79d1a26d2dd9f0d7729629
parentae90a0b2d18d66e7b1cb98b2e34fd697f8b5311a (diff)
parent01a1660c639b701d712ec7bdc1fa2d4b1f533d5d (diff)
downloadcgit-2d1c80df0a2576cdacc7f72c295b66c95565c1e8.tar.gz
Merge branch 'pb/darwin' into wip
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index eac24ad..1cdcba0 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,11 @@ ifeq ($(uname_O),Cygwin)
NEEDS_LIBICONV = YesPlease
endif
+ifeq ($(uname_S),Darwin)
+ NEEDS_LIBICONV = YesPlease
+ CGIT_SCRIPT_PATH = /usr/local/apache2/htdocs/cgit
+endif
+
#
# Let the user override the above settings.
#