Don't run man pages through configure
authorEric Biggers <ebiggers3@gmail.com>
Tue, 16 Dec 2014 01:45:49 +0000 (19:45 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Tue, 16 Dec 2014 02:18:33 +0000 (20:18 -0600)
The only remaining reason is to update the version number, but there is
already a sed command being run to update all the dates.  So we might as
well simplify by just having the unmodified man pages.

21 files changed:
Makefile.am
configure.ac
doc/man1/mkwinpeimg.1 [moved from doc/man1/mkwinpeimg.1.in with 100% similarity]
doc/man1/wimlib-imagex-append.1 [moved from doc/man1/imagex-append.1.in with 100% similarity]
doc/man1/wimlib-imagex-apply.1 [moved from doc/man1/imagex-apply.1.in with 99% similarity]
doc/man1/wimlib-imagex-capture.1 [moved from doc/man1/imagex-capture.1.in with 99% similarity]
doc/man1/wimlib-imagex-delete.1 [moved from doc/man1/imagex-delete.1.in with 96% similarity]
doc/man1/wimlib-imagex-dir.1 [moved from doc/man1/imagex-dir.1.in with 94% similarity]
doc/man1/wimlib-imagex-export.1 [moved from doc/man1/imagex-export.1.in with 99% similarity]
doc/man1/wimlib-imagex-extract.1 [moved from doc/man1/imagex-extract.1.in with 99% similarity]
doc/man1/wimlib-imagex-info.1 [moved from doc/man1/imagex-info.1.in with 97% similarity]
doc/man1/wimlib-imagex-join.1 [moved from doc/man1/imagex-join.1.in with 94% similarity]
doc/man1/wimlib-imagex-mount.1 [moved from doc/man1/imagex-mount.1.in with 99% similarity]
doc/man1/wimlib-imagex-mountrw.1 [moved from doc/man1/imagex-mountrw.1.in with 100% similarity]
doc/man1/wimlib-imagex-optimize.1 [moved from doc/man1/imagex-optimize.1.in with 98% similarity]
doc/man1/wimlib-imagex-split.1 [moved from doc/man1/imagex-split.1.in with 95% similarity]
doc/man1/wimlib-imagex-unmount.1 [moved from doc/man1/imagex-unmount.1.in with 100% similarity]
doc/man1/wimlib-imagex-update.1 [moved from doc/man1/imagex-update.1.in with 99% similarity]
doc/man1/wimlib-imagex-verify.1 [moved from doc/man1/imagex-verify.1.in with 96% similarity]
doc/man1/wimlib-imagex.1 [moved from doc/man1/imagex.1.in with 99% similarity]
update-version

index 24810ee..56ff24f 100644 (file)
@@ -248,6 +248,7 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \
+       $(man1_MANS)                            \
        build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \
@@ -270,7 +271,7 @@ pkgconfig_DATA      = wimlib.pc
 
 $(pkgconfig_DATA): config.status
 
-wimlib_manpages =                              \
+man1_MANS =                                    \
        doc/man1/wimlib-imagex.1                \
        doc/man1/wimlib-imagex-append.1         \
        doc/man1/wimlib-imagex-apply.1          \
@@ -290,11 +291,6 @@ wimlib_manpages =                          \
        doc/man1/wimlib-imagex-verify.1         \
        doc/man1/mkwinpeimg.1
 
-man1_MANS = $(wimlib_manpages)
-DISTCLEANFILES = $(wimlib_manpages)
-
-$(man1_MANS): config.status
-
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
index 6803b90..6a07d1e 100644 (file)
@@ -13,25 +13,7 @@ PKGCONFIG_PRIVATE_LIBS=""
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile]
                [doc/Doxyfile]
-               [wimlib.pc]
-               [doc/man1/wimlib-imagex.1:doc/man1/imagex.1.in]
-               [doc/man1/wimlib-imagex-append.1:doc/man1/imagex-append.1.in]
-               [doc/man1/wimlib-imagex-apply.1:doc/man1/imagex-apply.1.in]
-               [doc/man1/wimlib-imagex-capture.1:doc/man1/imagex-capture.1.in]
-               [doc/man1/wimlib-imagex-delete.1:doc/man1/imagex-delete.1.in]
-               [doc/man1/wimlib-imagex-dir.1:doc/man1/imagex-dir.1.in]
-               [doc/man1/wimlib-imagex-export.1:doc/man1/imagex-export.1.in]
-               [doc/man1/wimlib-imagex-extract.1:doc/man1/imagex-extract.1.in]
-               [doc/man1/wimlib-imagex-info.1:doc/man1/imagex-info.1.in]
-               [doc/man1/wimlib-imagex-join.1:doc/man1/imagex-join.1.in]
-               [doc/man1/wimlib-imagex-mount.1:doc/man1/imagex-mount.1.in]
-               [doc/man1/wimlib-imagex-mountrw.1:doc/man1/imagex-mountrw.1.in]
-               [doc/man1/wimlib-imagex-optimize.1:doc/man1/imagex-optimize.1.in]
-               [doc/man1/wimlib-imagex-split.1:doc/man1/imagex-split.1.in]
-               [doc/man1/wimlib-imagex-unmount.1:doc/man1/imagex-unmount.1.in]
-               [doc/man1/wimlib-imagex-update.1:doc/man1/imagex-update.1.in]
-               [doc/man1/wimlib-imagex-verify.1:doc/man1/imagex-verify.1.in]
-               [doc/man1/mkwinpeimg.1])
+               [wimlib.pc])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
 
similarity index 99%
rename from doc/man1/imagex-apply.1.in
rename to doc/man1/wimlib-imagex-apply.1
index 762c808..ac06d19 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-apply \- Extract one image, or all images, from a WIM archive
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex-capture.1.in
rename to doc/man1/wimlib-imagex-capture.1
index 3224f23..fa7159d 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-capture, wimlib-imagex-append \- Create or append a WIM image
 .SH SYNOPSIS
similarity index 96%
rename from doc/man1/imagex-delete.1.in
rename to doc/man1/wimlib-imagex-delete.1
index 9617e2e..52199d3 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-delete \- Delete an image from a WIM archive
 .SH SYNOPSIS
similarity index 94%
rename from doc/man1/imagex-dir.1.in
rename to doc/man1/wimlib-imagex-dir.1
index 304113e..4aff0d5 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-dir \- Show the files contained in a WIM archive
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex-export.1.in
rename to doc/man1/wimlib-imagex-export.1
index 753b9dd..5c3c4d0 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-export \- Exports an image from a WIM archive to an existing or new WIM archive
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex-extract.1.in
rename to doc/man1/wimlib-imagex-extract.1
index 67075b3..8ea278d 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-extract \- Extract files or directories from a WIM image
 .SH SYNOPSIS
similarity index 97%
rename from doc/man1/imagex-info.1.in
rename to doc/man1/wimlib-imagex-info.1
index 092f38e..11b1779 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-info \- Display information about a WIM file, or change information about
 an image
similarity index 94%
rename from doc/man1/imagex-join.1.in
rename to doc/man1/wimlib-imagex-join.1
index 5e837b4..4f540b6 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-join \- Join split WIMs into a standalone one-part WIM
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex-mount.1.in
rename to doc/man1/wimlib-imagex-mount.1
index e2827cf..91313bb 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-mount, wimlib-imagex-mountrw, wimlib-imagex-unmount \- Mount and unmount an image from a WIM archive
 .SH SYNOPSIS
similarity index 98%
rename from doc/man1/imagex-optimize.1.in
rename to doc/man1/wimlib-imagex-optimize.1
index 338fdae..929abd0 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-optimize \- Optimize a WIM archive
 .SH SYNOPSIS
similarity index 95%
rename from doc/man1/imagex-split.1.in
rename to doc/man1/wimlib-imagex-split.1
index fa16abb..e84e2f8 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-split \- Split a WIM into multiple parts
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex-update.1.in
rename to doc/man1/wimlib-imagex-update.1
index 3ed3feb..e3a5258 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-update \- Update a WIM image
 .SH SYNOPSIS
similarity index 96%
rename from doc/man1/imagex-verify.1.in
rename to doc/man1/wimlib-imagex-verify.1
index e6eef9f..e0b8592 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex-verify \- Verify a WIM file
 .SH SYNOPSIS
similarity index 99%
rename from doc/man1/imagex.1.in
rename to doc/man1/wimlib-imagex.1
index 6ae99b6..bdea8d9 100644 (file)
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX 1 "November 2014" "wimlib-imagex @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX 1 "November 2014" "wimlib 1.7.3" "User Commands"
 .SH NAME
 wimlib-imagex \- Extract, create, modify, or mount a WIM (Windows Imaging Format) archive
 .SH SYNOPSIS
index d413f98..b15fbfd 100755 (executable)
@@ -23,7 +23,8 @@ sed -i -e 's/\(#define WIMLIB_MAJOR_VERSION[[:space:]]\+\)[[:digit:]]\+/\1'$newm
        -e 's/\(the library interface of wimlib \)'$oldver'/\1'$newver'/' \
          include/wimlib.h
 
-sed -i -e "1s/$oldmonth $oldyear/$newmonth $newyear/" doc/man[1-9]/*.[1-9].in
+sed -i -e "1s/$oldmonth $oldyear/$newmonth $newyear/;s/wimlib $oldver/wimlib $newver/" \
+         doc/man[1-9]/*.[1-9]
 
 sed -i "s/pkgver=$oldver/pkgver=$newver/" archlinux/PKGBUILD