diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-30 14:55:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-30 15:01:08 -0400 |
| commit | ee3a0551a78534ede078f8340a6f075245815914 (patch) | |
| tree | 6fb64ea837927c70b6cf4109104dea4cfe110d7d /Makefile | |
| parent | 896726cde425f6c74273b35cde30c1909551ff66 (diff) | |
| parent | 56aeeb4565dd419c315d370f6e648abfe009a7d3 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -11,6 +11,8 @@ mans=git-annex.1 git-annex-shell.1 git-union-merge.1 all: $(bins) $(mans) docs +sources: SysConfig.hs StatFS.hs Touch.hs Remote/S3.hs + SysConfig.hs: configure.hs TestConfig.hs $(GHCMAKE) configure ./configure @@ -19,8 +21,10 @@ SysConfig.hs: configure.hs TestConfig.hs hsc2hs $< perl -i -pe 's/^{-# INCLUDE.*//' $@ -Remote/S3.o: +Remote/S3.hs: @ln -sf S3real.hs Remote/S3.hs + +Remote/S3.o: Remote/S3.hs @if ! $(GHCMAKE) Remote/S3.hs; then \ ln -sf S3stub.hs Remote/S3.hs; \ echo "** building without S3 support"; \ |