Skip to content

Commit

Permalink
Convert the remaining man pages in bin to asciidoc
Browse files Browse the repository at this point in the history
  * Convert bin/fvwm-menu-directory.1, bin/fvwm-perllib.1,
    and bin/fvwm-menu-xlock.1 to asciidoc files in doc/
    so they can be built into html files.
  * Add a comment in the POD that the man pages have moved
    (though the man pages haven't been generated from the pod since 2009).
  * Remove the perl check in the --enable-mandoc and --enable-htmldoc
    options, since perl isn't used to build the docs.
  * Remove sed checks as well, since SED is no longer used in either
    manpage or htmldoc creation.
  • Loading branch information
somiaj authored and ThomasAdam committed Oct 29, 2023
1 parent 5b6ca6b commit e8432f5
Show file tree
Hide file tree
Showing 11 changed files with 447 additions and 797 deletions.
36 changes: 1 addition & 35 deletions bin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ bin_SCRIPTS = fvwm-perllib \
fvwm-menu-desktop \
FvwmCommand

man_MANS = fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-perllib.1

LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 $(xpm_LIBS) $(Xcursor_LIBS) \
$(X_PRE_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) $(Xrender_LIBS) \
$(Xcursor_LIBS) $(png_LIBS) $(rsvg_LIBS) $(XRandR_LIBS) \
Expand All @@ -24,43 +22,11 @@ AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS) $(png_CFLAGS) \
configdir = @FVWM_DATADIR@
config_DATA = fvwm-menu-desktop-config.fpl

EXTRA_DIST = fvwm-menu-desktop-config.fpl $(man_MANS) FvwmPrompt
EXTRA_DIST = fvwm-menu-desktop-config.fpl FvwmPrompt

dist-hook:
rm -f $(distdir)/FvwmPrompt/FvwmPrompt

## The long generation for *.1 is to make both pod2man and 'make -j' happy.

_fvwm-menu-xlock.1: fvwm-menu-xlock
@TMP=tmp-$$$$ NAME=fvwm-menu-xlock && (\
mkdir $$TMP && \
cp $$NAME.in $$TMP/$$NAME && \
pod2man --center "Fvwm Utilities" --release "@VERSION@@VERSIONINFO@" \
--name $$NAME $$TMP/$$NAME >$$TMP/$$NAME.1 && \
mv $$TMP/$$NAME.1 .; \
rm -rf $$TMP)

_fvwm-menu-directory.1: fvwm-menu-directory
@TMP=tmp-$$$$ NAME=fvwm-menu-directory && (\
mkdir $$TMP && \
cp $$NAME.in $$TMP/$$NAME && \
pod2man --center "Fvwm Utilities" --release "@VERSION@@VERSIONINFO@" \
--name $$NAME $$TMP/$$NAME >$$TMP/$$NAME.1 && \
mv $$TMP/$$NAME.1 .; \
rm -rf $$TMP)

_fvwm-perllib.1: fvwm-perllib
@TMP=tmp-$$$$ NAME=fvwm-perllib && (\
mkdir $$TMP && \
cp $$NAME.in $$TMP/$$NAME && \
pod2man --center "Fvwm Utilities" --release "@VERSION@@VERSIONINFO@" \
--name $$NAME $$TMP/$$NAME >$$TMP/$$NAME.1 && \
mv $$TMP/$$NAME.1 .; \
rm -rf $$TMP)

regenerate: \
_fvwm-menu-xlock.1

## Create compatibility symlinks if available

fvwm_root_name =`echo "fvwm-root" | "$(SED)" -e "${transform}"`
Expand Down
330 changes: 0 additions & 330 deletions bin/fvwm-menu-directory.1

This file was deleted.

3 changes: 2 additions & 1 deletion bin/fvwm-menu-directory.in
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@ sub wrong_usage {
__END__

# ---------------------------------------------------------------------------

# Manpage has been moved to doc/fvwm-menu-directory.adoc.
# This is no loner used to generate the manpage.
=head1 NAME

fvwm-menu-directory - builds a directory browsing menu for fvwm
Expand Down
Loading

0 comments on commit e8432f5

Please sign in to comment.