mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The Makefile now builds with the new yesod by default.

Browse source 
Systems like Debian that have the old yesod 1.0.1 should set
GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
This commit is contained in:
Joey Hess 2012-09-28 15:57:55 -04:00
parent 9ae50fc398
commit 1117583087
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -5,7 +5,9 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
# If you get build failures due to missing haskell libraries, # If you get build failures due to missing haskell libraries,
# you can turn off some of these features. # you can turn off some of these features.
FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_PAIRING #
# If you're using an old version of yesod, enable -DWITH_OLD_YESOD
FEATURES=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING
bins=git-annex bins=git-annex
mans=git-annex.1 git-annex-shell.1 mans=git-annex.1 git-annex-shell.1

3
debian/changelog vendored
View file

@ -19,6 +19,9 @@ git-annex (3.20120925) UNRELEASED; urgency=low
* webapp: Avoid crashing when ssh-keygen -F chokes on an invalid known_hosts * webapp: Avoid crashing when ssh-keygen -F chokes on an invalid known_hosts
file. file.
* Always do a system wide installation when DESTDIR is set. Closes: #689052 * Always do a system wide installation when DESTDIR is set. Closes: #689052
* The Makefile now builds with the new yesod by default.
Systems like Debian that have the old yesod 1.0.1 should set
GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
-- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400

3
debian/rules vendored
View file

@ -1,4 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
%: %:
dh $@ dh $@