more robust docmake detect+invoke

shlomif · Dec 17, 2024 · 95bbd5d · 95bbd5d
1 parent 5608c4c
commit 95bbd5d
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/fortune-mod/util/FortuneMod/ManPage/Generate/App.pm b/fortune-mod/util/FortuneMod/ManPage/Generate/App.pm
@@ -48,15 +48,29 @@ sub run
         {
             $ENV{PATH} = $path_prefix . $ENV{PATH};
         }
-        __PACKAGE__->do_system(
-            {
-                cmd => [
-                    "docmake",
-                    "manpages",
-"${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${basename}.docbook5.xml",
-                ],
-            },
+        my @args = (
+            "manpages",
+            "${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${basename}.docbook5.xml",
         );
+        eval {
+            require App::Docmake;
+            local @ARGV = @args;
+            if ( App::Docmake->new( { argv => [@ARGV] } )->run() )
+            {
+                warn "could not invoke App::Docmake :: run() properly";
+                die;
+            }
+        };
+        my $Err = $@;
+        if ($Err)
+        {
+            warn "App::Docmake from CPAN malfunctioned. $@";
+            __PACKAGE__->do_system(
+                {
+                    cmd => [ "docmake", @args, ],
+                },
+            );
+        }
     }
 
     path("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/${dest_basename}.man")