getopt: use examples installation directory in man page

Addresses: https://bugs.debian.org/913049
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/Makefile.am b/Makefile.am
index 8d94b081165c9aedb67ab20ad4b29d74c8cb3e16..88943f1e454caa4a3c86066d3681fdec7ecfd5c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,7 @@ edit_cmd = sed \
         -e 's|@datadir[@]|$(datadir)|g' \
         -e 's|@sbindir[@]|$(sbindir)|g' \
         -e 's|@bindir[@]|$(bindir)|g' \
+        -e 's|@docdir[@]|$(docdir)|g' \
         -e 's|@includedir[@]|$(includedir)|g' \
         -e 's|@runstatedir[@]|$(runstatedir)|g' \
         -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \

diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index db148ba7461a87a463f231c8a7a192c326c6c639..c0287917d918f0399a25ac39c4af54a4e7013d76 100644 (file)
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -1,3 +1,4 @@
+getopt.1
 uuidd.8
 uuidd.rc
 uuidd.service

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index f56a819ac0d2928a3e4067364ee2eb0680edccfb..4d933f1df94e7440b8f2a92d555f402f522d9947 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -202,6 +202,7 @@ endif
 if BUILD_GETOPT
 usrbin_exec_PROGRAMS += getopt
 dist_man_MANS += misc-utils/getopt.1
+PATHFILES += misc-utils/getopt.1
 getopt_SOURCES = misc-utils/getopt.c
 getoptexampledir = $(docdir)/getopt/
 dist_getoptexample_SCRIPTS = \

diff --git a/misc-utils/getopt.1 b/misc-utils/getopt.1.in
similarity index 99%
rename from misc-utils/getopt.1
rename to misc-utils/getopt.1.in
index 47e032b7ac37deb190d9d73e0d6610597223ede7..1e913ea22b27df1ce4f147e1b34c5144d70ff6dc 100644 (file)
--- a/misc-utils/getopt.1
+++ b/misc-utils/getopt.1.in
@@ -417,11 +417,9 @@ if it is called with
 .SH EXAMPLES
 Example scripts for (ba)sh and (t)csh are provided with the
 .BR getopt (1)
-distribution, and are optionally installed in
-.I /usr/share/getopt/
-or
-.I /usr/share/doc/
-in the util-linux subdirectory.
+distribution, and are installed in
+.I @docdir@/getopt/
+directory.
 .SH ENVIRONMENT
 .IP POSIXLY_CORRECT
 This environment variable is examined by the