diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-11 11:47:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-11 11:47:53 -0400 |
| commit | 69cb6af4b7f6b16a69734d75ef5583bd2797c173 (patch) | |
| tree | 2342a1c3b8ced54e0cde32afce963d643294a718 /Makefile | |
| parent | 3ce402a4c63e4ac04ab788cfd3ad8ea964b402ef (diff) | |
Now uses the Haskell Glob library, rather than pcre-light, avoiding the need to install libpcre. Currently done only for Cabal or when the Makefile is made to use -DWITH_GLOB
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6,7 +6,7 @@ BASEFLAGS=-Wall -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtility # you can turn off some of these features. # # If you're using an old version of yesod, enable -DWITH_OLD_YESOD -FEATURES?=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBDAV -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS +FEATURES?=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBDAV -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS -DWITH_GLOB bins=git-annex mans=git-annex.1 git-annex-shell.1 @@ -234,7 +234,7 @@ android: $(MAKE) Build/SysConfig.hs GHC=$$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin/arm-unknown-linux-androideabi-ghc \ CC=$$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin/arm-linux-androideabi-gcc \ - FEATURES="-DWITH_ANDROID -DWITH_ASSISTANT -DWITH_DNS" \ + FEATURES="-DWITH_ANDROID -DWITH_ASSISTANT -DWITH_GLOB -DWITH_DNS" \ ANDROID=1 $(MAKE) fast # used by ./ghci |