Fix megaparsec-8 update

[doclang.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 50b13d621f859c5f2584c99d72197cbcdfeeb8cc..b668a085723211f4cc3a0f1d08727f485a77d2f8 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -12,15 +12,15 @@ test:
        { stack $(STACK_FLAGS) test $(STACK_TEST_FLAGS); }
 
 GHCID_TEST_ARGS ?=
-GHCID_TEST ?= ":main $(GHCID_TEST_ARGS)"
+#GHCID_TEST ?= System.Environment.setEnv \"LANG\" \"$(LANG)\"$$(printf "\\n:")main $(GHCID_TEST_ARGS)
+GHCID_TEST ?= :main $(GHCID_TEST_ARGS)
 ghcid:
        ghcid \
         --warnings \
-        --command "stack ghci \
-          $(package):lib \
-          $(package):$(package) \
+        --command "stack $(STACK_FLAGS) $(GHCID_STACK_FLAGS) ghci $(GHCID_GHCI_FLAGS) \
+          $(shell 2>&1 stack ide targets | grep -v :test:) \
           --ghci-options=-fobject-code" \
-        --test $(GHCID_TEST) \
+        --test "$(GHCID_TEST)" \
         $(GHCID_FLAGS)
 
 clean:
@@ -49,7 +49,7 @@ doc:
 HLint.hs: $(shell find . -name '*.hs' -not -name 'HLint.hs')
        sed -i -e '/^-- BEGIN: generated hints/,/^-- END: Generated by hlint/d' HLint.hs
        echo '-- BEGIN: generated hints' >> HLint.hs
-       hlint --find . | grep '^'infix | sort -u >> HLint.hs
+       hlint --find . | sed -ne 's/^- infix: \(.*\)/\1/p' | sort -u >>HLint.hs
        echo '-- END: generated hints' >> HLint.hs
 
 lint: HLint.hs