diff --git a/Makefile b/Makefile index 6ac241f67e..3d978df160 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all=git-annex git-annex-shell mans docs Build/InstallDesktopFile +all=git-annex git-annex-shell mans docs # set to "./Setup" if you lack a cabal program. Or can be set to "stack" BUILDER?=cabal @@ -85,28 +85,26 @@ retest: git-annex tags: (for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags -# If ikiwiki is available, build static html docs suitable for being -# shipped in the software package. -ifeq ($(shell which ikiwiki),) -IKIWIKI=echo "** ikiwiki not found, skipping building docs" >&2; true -else -IKIWIKI=ikiwiki -endif - mans: Build/MakeMans ./Build/MakeMans +# If ikiwiki is available, build static html docs suitable for being +# shipped in the software package. docs: mans - LC_ALL=C TZ=UTC $(IKIWIKI) doc html -v --wikiname git-annex \ - --plugin=goodstuff \ - --no-usedirs --disable-plugin=openid --plugin=sidebar \ - --plugin theme --set theme=actiontabs --set deterministic=1 \ - --disable-plugin=shortcut --disable-plugin=smiley \ - --plugin=comments --set comments_pagespec="*" \ - --exclude='ikiwiki/*' \ - --exclude='news/.*' --exclude='design/assistant/blog/*' \ - --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \ - --exclude='users/*' --exclude='devblog/*' --exclude='thanks' + @if [ -n "`which ikiwiki`" ]; then \ + LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \ + --plugin=goodstuff \ + --no-usedirs --disable-plugin=openid --plugin=sidebar \ + --plugin theme --set theme=actiontabs --set deterministic=1 \ + --disable-plugin=shortcut --disable-plugin=smiley \ + --plugin=comments --set comments_pagespec="*" \ + --exclude='ikiwiki/*' \ + --exclude='news/.*' --exclude='design/assistant/blog/*' \ + --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \ + --exclude='users/*' --exclude='devblog/*' --exclude='thanks'; \ + else \ + echo "** ikiwiki not found, skipping building docs" >&2; \ + fi clean: if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi diff --git a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn index 02fac5a6a8..f2cea95f50 100644 --- a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn +++ b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn @@ -40,3 +40,5 @@ No intended functional change; only what *make* prints should be different. --plugin=goodstuff \ --no-usedirs --disable-plugin=openid --plugin=sidebar \ --plugin theme --set theme=actiontabs --set deterministic=1 \ + +> [[done]] --[[Joey]] diff --git a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment new file mode 100644 index 0000000000..31a6700866 --- /dev/null +++ b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-11-07T20:31:00Z" + content=""" +I don't like this amount of complication for a build system cosmetic +improvement. Instead, I have added a "@" to the objectionably long +command line in the Makefile. +"""]]