From eae4922d122dbc25a09a243a2f8e8b332c34dcd7 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 27 Jun 2021 17:26:00 -1000
Subject: [PATCH] doc: info directory entries: fixes, cleanup (#1585)

---
 Shake.hs                      | 9 ++++-----
 hledger-ui/hledger-ui.m4.md   | 5 -----
 hledger-web/hledger-web.m4.md | 5 -----
 hledger/hledger.m4.md         | 5 -----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/Shake.hs b/Shake.hs
index 24bdea635..27e393cb6 100755
--- a/Shake.hs
+++ b/Shake.hs
@@ -466,7 +466,6 @@ main = do
             packagemanversionm4 = dir </> ".version.m4"
             packagemandatem4 = dir </> ".date.m4"
             infodirentry = dir </> "dir-entry.info"
-            infodir = dir </> "dir"
         -- assume any other .m4.md files in dir are included by this one XXX not true in hledger-lib
         subfiles <- liftIO $ filter (/= src) . filter (".m4.md" `isSuffixOf`) . map (dir </>) <$> S.getDirectoryContents dir
         need $ [src, commonm4, commandsm4, packagemanversionm4, packagemandatem4, infodirentry] ++ subfiles
@@ -494,12 +493,12 @@ main = do
       -- in Info's directory (table of contents) if these (filesystem) directories
       -- are added to INFOPATH.
       infodirs |%> \out -> do -- hledger/dir
-        let dir        = takeDirectory out
-            infomanual = dir </> dir <.> "info"
-            infodir    = dir </> "dir"
+        let outdir     = takeDirectory out
+            infomanual = outdir </> outdir <.> "info"  -- XXX cutting corners
+            dirfile    = outdir </> "dir"
         need [infomanual]
         cmd_ Shell "rm -f" out
-        cmd Shell "install-info" infomanual infodir
+        cmd Shell "install-info" infomanual dirfile
 
 
       -- WEBSITE MARKDOWN SOURCE
diff --git a/hledger-ui/hledger-ui.m4.md b/hledger-ui/hledger-ui.m4.md
index ffb51986f..10f8a6a6f 100644
--- a/hledger-ui/hledger-ui.m4.md
+++ b/hledger-ui/hledger-ui.m4.md
@@ -2,11 +2,6 @@
 % _author_
 % _monthyear_
 
-_info_({{INFO-DIR-SECTION User Applications}})
-_info_({{START-INFO-DIR-ENTRY}})
-_info_({{* HLedger-UI: (hledger-ui).           Command-Line Accounting (TUI)}})
-_info_({{END-INFO-DIR-ENTRY}})
-
 _man_({{
 # NAME
 }})
diff --git a/hledger-web/hledger-web.m4.md b/hledger-web/hledger-web.m4.md
index f8ec6bc55..215348411 100644
--- a/hledger-web/hledger-web.m4.md
+++ b/hledger-web/hledger-web.m4.md
@@ -2,11 +2,6 @@
 % _author_
 % _monthyear_
 
-_info_({{INFO-DIR-SECTION User Applications}})
-_info_({{START-INFO-DIR-ENTRY}})
-_info_({{* HLedger-Web: (hledger-web).           Command-Line Accounting (Web UI)}})
-_info_({{END-INFO-DIR-ENTRY}})
-
 _man_({{
 # NAME
 }})
diff --git a/hledger/hledger.m4.md b/hledger/hledger.m4.md
index 58c6e85e8..f287b5e71 100644
--- a/hledger/hledger.m4.md
+++ b/hledger/hledger.m4.md
@@ -54,11 +54,6 @@ _web_({{
 [Common tasks]*
 }})
 
-_info_({{INFO-DIR-SECTION User Applications}})
-_info_({{START-INFO-DIR-ENTRY}})
-_info_({{* HLedger: (hledger).           Command-Line Accounting}})
-_info_({{END-INFO-DIR-ENTRY}})
-
 _man_({{
 # NAME
 }})