X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=cabal-package.mk;h=6c96697f39f307a8c537c9e1f208a2e4a98e96d3;hb=5fda588b9e7f64096f1033b3833f6af79bba30e2;hp=bec1d1419da2a391f41db8acf50c6422ae8ed693;hpb=6763d10d661f388d4029a3631c2bccdadc667915;p=cabal-shared-makefile.git

diff --git a/cabal-package.mk b/cabal-package.mk
index bec1d14..6c96697 100644
--- a/cabal-package.mk
+++ b/cabal-package.mk
@@ -8,20 +8,25 @@
 #   RUN_COMMAND :: command to be run for "make run"
 #
 
-GHC      ?= ghc
-FIND     ?= find
-RM_RF    ?= rm -rf
-SUDO     ?= sudo
 AUTOCONF ?= autoconf
+DARCS    ?= darcs
+DITZ     ?= ditz
+FIND     ?= find
+GREP     ?= grep
+GHC      ?= ghc
+GIT      ?= git
 HLINT    ?= hlint
 HPC      ?= hpc
-DITZ     ?= ditz
+RM_RF    ?= rm -rf
+RSYNC    ?= rsync
+SUDO     ?= sudo
 
 CONFIGURE_ARGS ?= --disable-optimization
 HADDOCK_OPTS   ?= --hyperlink-source
 HLINT_OPTS     ?= \
 	--hint=Default --hint=Dollar --hint=Generalise \
 	--cross \
+	--ignore="Parse error" \
 	--report=dist/report.html
 
 SETUP_FILE := $(wildcard Setup.*hs)
@@ -106,6 +111,13 @@ test: build
 	fi
 
 # -- Find FIXME Tags ----------------------------------------------------------
+ifeq ($(shell ls -d .git 2>/dev/null),.git)
+fixme:
+	@$(FIND) . \
+		-depth 1 -not -name '*.mk' \
+		-exec $(GIT) grep -E 'FIXME|THINKME|TODO' {} + \
+		|| echo 'No FIXME, THINKME, nor TODO found.'
+else
 fixme:
 	@$(FIND) . \
 		\( -name 'dist' -or -name '.git' -or -name '_darcs' \) -prune \
@@ -113,8 +125,9 @@ fixme:
 		\( -name '*.c'   -or -name '*.h'   -or \
 		   -name '*.hs'  -or -name '*.lhs' -or \
 		   -name '*.hsc' -or -name '*.cabal' \) \
-		-exec egrep 'FIXME|THINKME|TODO' {} \+ \
+		-exec $(GREP) -n -E 'FIXME|THINKME|TODO' {} + \
 		|| echo 'No FIXME, THINKME, nor TODO found.'
+endif
 
 # -- HLint --------------------------------------------------------------------
 HLINT_TARGETS ?= $$(find -E . -type d -name dist -prune -o -regex '.*\.(hsc?|lhs)' -print)
@@ -141,21 +154,21 @@ push: push-repo push-ditz push-doc
 
 push-repo:
 	if [ -d "_darcs" ]; then \
-		darcs push; \
+		$(DARCS) push; \
 	elif [ -d ".git" ]; then \
-		git push --all && git push --tags; \
+		$(GIT) push --all && git push --tags; \
 	fi
 
 push-ditz: ditz
 	if [ -d "dist/ditz" ]; then \
-		rsync -av --delete \
+		$(RSYNC) -av --delete \
 			dist/ditz/ \
 			www@nem.cielonegro.org:static.cielonegro.org/htdocs/ditz/$(PKG_NAME); \
 	fi
 
 push-doc: doc
 	if [ -d "dist/doc" ]; then \
-		rsync -av --delete \
+		$(RSYNC) -av --delete \
 			dist/doc/html/$(PKG_NAME)/ \
 			www@nem.cielonegro.org:static.cielonegro.org/htdocs/doc/$(PKG_NAME); \
 	fi