summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-22 11:51:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-22 11:53:14 -0400
commita83987e95a45a7b48925292748f6f470d41d2ea3 (patch)
treeabe728bf006b9a9430731d12ab16b89fbe009a13
parent491b64541b7f81725b5fc45ce6b1026bb39d8430 (diff)
avoid running BUILDER clean when it's cabal
This alows debian/rules clean to work when build deps are not installed.
-rw-r--r--Makefile2
-rw-r--r--doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found/comment_3_0e944b73b3bfe2edc310710f17807985._comment9
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 937d2462a..6d8dca599 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ docs: mans
--exclude='users/*' --exclude='devblog/*' --exclude='thanks'
clean:
- if [ "$(BUILDER)" != ./Setup ]; then $(BUILDER) clean; fi
+ if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi
rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \
doc/.ikiwiki html dist tags Build/SysConfig.hs \
Setup Build/InstallDesktopFile Build/EvilSplicer \
diff --git a/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found/comment_3_0e944b73b3bfe2edc310710f17807985._comment b/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found/comment_3_0e944b73b3bfe2edc310710f17807985._comment
new file mode 100644
index 000000000..69bf69aa3
--- /dev/null
+++ b/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found/comment_3_0e944b73b3bfe2edc310710f17807985._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2016-01-22T15:49:19Z"
+ content="""
+That's a reasonable thing to want to do. It might be that passing -nc to
+dpkg-buildpackage would be the best thing to do. In any case,
+I've adjusted the Makefile.
+"""]]