tool: fix the listhelp generation command

The previous command line to generate the tool_listhelp.c source file
broke with 2494b8dd5175cee7.

Make 'make listhelp' invoked in src/ generate it. Also update the
comment in the file to mention the right procedure.

Closes #12786

diff --git a/docs/cmdline-opts/Makefile.am b/docs/cmdline-opts/Makefile.am
index 6fff55f484f91df8198a384bd4e5ed7969178eac..e9b35ac05269d32eeb652afc24fe202340e661be 100644 (file)
--- a/docs/cmdline-opts/Makefile.am
+++ b/docs/cmdline-opts/Makefile.am
@@ -39,3 +39,6 @@ all: $(MANPAGE)
 
 $(MANPAGE): $(DPAGES) $(SUPPORT) mainpage.idx Makefile.inc gen.pl
        $(GEN)(rm -f $(MANPAGE) && cd $(srcdir) && @PERL@ ./gen.pl mainpage $(DPAGES) > $(builddir)/manpage.tmp && mv $(builddir)/manpage.tmp $(MANPAGE))
+
+listhelp:
+       ./gen.pl listhelp $(DPAGES) > $(top_builddir)/src/tool_listhelp.c

diff --git a/docs/cmdline-opts/gen.pl b/docs/cmdline-opts/gen.pl
index 152d09595c335631e71201c1d8289cdbfca0378f..f4dcce8aebbbf5bb03e61d76c598da643572fd39 100755 (executable)
--- a/docs/cmdline-opts/gen.pl
+++ b/docs/cmdline-opts/gen.pl
@@ -727,10 +727,10 @@ sub listhelp {
 
 /*
  * DO NOT edit tool_listhelp.c manually.
- * This source file is generated with the following command:
-
-  cd \$srcroot/docs/cmdline-opts
-  ./gen.pl listhelp *.d > \$srcroot/src/tool_listhelp.c
+ * This source file is generated with the following command in an autotools
+ * build:
+ *
+ * "make listhelp"
  */
 
 const struct helptxt helptext[] = {

diff --git a/src/Makefile.am b/src/Makefile.am
index dced53e0f9861dac318f9e539b15ed3218c19b3a..7a99c254803d28b98ee720a6d0635be7d0eddc68 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -157,7 +157,7 @@ tidy:
        $(TIDY) $(CURL_CFILES) $(TIDYFLAGS) -- $(curl_CPPFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H
 
 listhelp:
-       (cd $(top_srcdir)/docs/cmdline-opts && ./gen.pl listhelp *.d) > tool_listhelp.c
+       (cd $(top_srcdir)/docs/cmdline-opts && make listhelp)
 
 if HAVE_WINDRES
 .rc.o:

diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c
index 59a5c95c99ab1ef06e471e73ad2429f6d54342b5..32ed2533e184f29413e80cf1c6536e0d4adc9ba2 100644 (file)
--- a/src/tool_listhelp.c
+++ b/src/tool_listhelp.c
@@ -26,10 +26,10 @@
 
 /*
  * DO NOT edit tool_listhelp.c manually.
- * This source file is generated with the following command:
-
-  cd $srcroot/docs/cmdline-opts
-  ./gen.pl listhelp *.d > $srcroot/src/tool_listhelp.c
+ * This source file is generated with the following command in an autotools
+ * build:
+ *
+ * "make listhelp"
  */
 
 const struct helptxt helptext[] = {