From 43310c6524530acb2fd07753961b0d26b70710f7 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Thu, 11 Dec 2014 09:18:14 -0600 Subject: [PATCH] wmclock: Update manpage. Changes include: - Rename to wmclock.1. - Use @prefix@ instead of /usr for the location of the language xpm files. - Hardcode date instead of picking it up from a variable in the Makefile. --- wmclock/Makefile.am | 2 +- wmclock/configure.ac | 2 +- wmclock/{wmclock.man.in => wmclock.1.in} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename wmclock/{wmclock.man.in => wmclock.1.in} (97%) diff --git a/wmclock/Makefile.am b/wmclock/Makefile.am index 52b18db..ac1734d 100644 --- a/wmclock/Makefile.am +++ b/wmclock/Makefile.am @@ -3,5 +3,5 @@ wmclock_SOURCES = dynlist.c dynlist.h wmclock.c \ xpm/date.xpm xpm/led.xpm xpm/mask.xbm xpm/mask.xbm AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(xext_CFLAGS) LIBS += $(x11_LIBS) $(xpm_LIBS) $(xext_LIBS) -dist_man_MANS = wmclock.man +dist_man_MANS = wmclock.1 nobase_dist_pkgdata_DATA = lang.*/*.xpm diff --git a/wmclock/configure.ac b/wmclock/configure.ac index b24bc23..79cd41a 100644 --- a/wmclock/configure.ac +++ b/wmclock/configure.ac @@ -25,5 +25,5 @@ ln -s "./${LangDir}/weekday.xpm" . PKG_CHECK_MODULES([x11], [x11]) PKG_CHECK_MODULES([xpm], [xpm]) PKG_CHECK_MODULES([xext], [xext]) -AC_CONFIG_FILES([Makefile wmclock.man]) +AC_CONFIG_FILES([Makefile wmclock.1]) AC_OUTPUT diff --git a/wmclock/wmclock.man.in b/wmclock/wmclock.1.in similarity index 97% rename from wmclock/wmclock.man.in rename to wmclock/wmclock.1.in index 704323b..39a3410 100644 --- a/wmclock/wmclock.man.in +++ b/wmclock/wmclock.1.in @@ -21,7 +21,7 @@ .TP \\$1 .. .\" ---------------------------------------------------------------- -.TH wmclock 1x "@DATE@" "Version @VERSION@" +.TH wmclock 1 "2014-Dec-11" "Version @VERSION@" .\" ---------------------------------------------------------------- .SH NAME wmclock \- A dockable clock for the Window Maker window manager @@ -169,7 +169,7 @@ at the bottom. You can find XPM files for a variety of languages in: .PP .RS -.BR /usr/share/wmclock/ +.BR "@prefix@/share/wmclock" .RE .PP For example, to have a French display, you could use the following @@ -177,7 +177,7 @@ command line: .PP .RS .TQ -wmclock \-monthxpm /usr/share/wmclock/lang.french/month.xpm \-weekdayxpm /usr/share/wmclock/lang.french/weekday.xpm +wmclock \-monthxpm @prefix@/share/wmclock/lang.french/month.xpm \-weekdayxpm @prefix@/share/wmclock/lang.french/weekday.xpm .RE .PP .SS Obsolete Options