Don't run man pages through configure

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.

diff --git a/Makefile.am b/Makefile.am
index 24810eec15c8951477c3136b150e25931c8a9eb2..56ff24f7a5dd99329591ac3641eeb35c163e6cee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,6 +248,7 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \

+       $(man1_MANS)                            \

        build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \
        build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \


@@ -270,7 +271,7 @@ pkgconfig_DATA      = wimlib.pc
 
 $(pkgconfig_DATA): config.status
 
 
 $(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          \
        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
 
        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
 
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 

diff --git a/configure.ac b/configure.ac
index 6803b90b0a4bada51a6932248f4bda051fb61ffd..6a07d1ea5c3be839995ca6ac7a26887a10329cfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,25 +13,7 @@ PKGCONFIG_PRIVATE_LIBS=""
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile]
                [doc/Doxyfile]
 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])
 
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
 

diff --git a/doc/man1/mkwinpeimg.1.in b/doc/man1/mkwinpeimg.1
similarity index 100%
rename from doc/man1/mkwinpeimg.1.in
rename to doc/man1/mkwinpeimg.1

diff --git a/doc/man1/imagex-append.1.in b/doc/man1/wimlib-imagex-append.1
similarity index 100%
rename from doc/man1/imagex-append.1.in
rename to doc/man1/wimlib-imagex-append.1

diff --git a/doc/man1/imagex-apply.1.in b/doc/man1/wimlib-imagex-apply.1
similarity index 99%
rename from doc/man1/imagex-apply.1.in
rename to doc/man1/wimlib-imagex-apply.1
index 762c808dc62cff0799bfeeb62f2fdeeb835a970a..ac06d19c0c6ce08b728a02d21285e93436b7e24a 100644 (file)
--- a/doc/man1/imagex-apply.1.in
+++ b/doc/man1/wimlib-imagex-apply.1
@@ -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
 .SH NAME
 wimlib-imagex-apply \- Extract one image, or all images, from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-capture.1.in b/doc/man1/wimlib-imagex-capture.1
similarity index 99%
rename from doc/man1/imagex-capture.1.in
rename to doc/man1/wimlib-imagex-capture.1
index 3224f236c2e6e4ceee7778d9774530dad04e9e9d..fa7159d675733e2225bbeca14cdbdfa008cfb712 100644 (file)
--- a/doc/man1/imagex-capture.1.in
+++ b/doc/man1/wimlib-imagex-capture.1
@@ -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
 .SH NAME
 wimlib-imagex-capture, wimlib-imagex-append \- Create or append a WIM image
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-delete.1.in b/doc/man1/wimlib-imagex-delete.1
similarity index 96%
rename from doc/man1/imagex-delete.1.in
rename to doc/man1/wimlib-imagex-delete.1
index 9617e2e7d6f8b7e0040b36cf9a0e105a6622ded7..52199d38af17a758e750f043c75c83b8816bf9d4 100644 (file)
--- a/doc/man1/imagex-delete.1.in
+++ b/doc/man1/wimlib-imagex-delete.1
@@ -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
 .SH NAME
 wimlib-imagex-delete \- Delete an image from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-dir.1.in b/doc/man1/wimlib-imagex-dir.1
similarity index 94%
rename from doc/man1/imagex-dir.1.in
rename to doc/man1/wimlib-imagex-dir.1
index 304113e54edd9e705c80c4d2c1ee661e19ff0fc7..4aff0d5194a59dc49eb56ba2445e5e4a4e657ff6 100644 (file)
--- a/doc/man1/imagex-dir.1.in
+++ b/doc/man1/wimlib-imagex-dir.1
@@ -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
 .SH NAME
 wimlib-imagex-dir \- Show the files contained in a WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-export.1.in b/doc/man1/wimlib-imagex-export.1
similarity index 99%
rename from doc/man1/imagex-export.1.in
rename to doc/man1/wimlib-imagex-export.1
index 753b9dd285f78d4e34287053074708625482f338..5c3c4d073910deb0d284e74da35875a3152c0991 100644 (file)
--- a/doc/man1/imagex-export.1.in
+++ b/doc/man1/wimlib-imagex-export.1
@@ -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
 .SH NAME
 wimlib-imagex-export \- Exports an image from a WIM archive to an existing or new WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-extract.1.in b/doc/man1/wimlib-imagex-extract.1
similarity index 99%
rename from doc/man1/imagex-extract.1.in
rename to doc/man1/wimlib-imagex-extract.1
index 67075b32522f3a942c3edd08a9f41292a4d3f53f..8ea278d8ec0fb5d70a06a40b644aab35ff80dd36 100644 (file)
--- a/doc/man1/imagex-extract.1.in
+++ b/doc/man1/wimlib-imagex-extract.1
@@ -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
 .SH NAME
 wimlib-imagex-extract \- Extract files or directories from a WIM image
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-info.1.in b/doc/man1/wimlib-imagex-info.1
similarity index 97%
rename from doc/man1/imagex-info.1.in
rename to doc/man1/wimlib-imagex-info.1
index 092f38e99bc06e860f83f23077016c0854fc4ca5..11b1779fe68150427e91893c22688f5b6e6abb2c 100644 (file)
--- a/doc/man1/imagex-info.1.in
+++ b/doc/man1/wimlib-imagex-info.1
@@ -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
 .SH NAME
 wimlib-imagex-info \- Display information about a WIM file, or change information about
 an image

diff --git a/doc/man1/imagex-join.1.in b/doc/man1/wimlib-imagex-join.1
similarity index 94%
rename from doc/man1/imagex-join.1.in
rename to doc/man1/wimlib-imagex-join.1
index 5e837b449b90f04e24356f8e0439e173ad411188..4f540b6d77fca0690351fd37a7cece18f56cebf9 100644 (file)
--- a/doc/man1/imagex-join.1.in
+++ b/doc/man1/wimlib-imagex-join.1
@@ -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
 .SH NAME
 wimlib-imagex-join \- Join split WIMs into a standalone one-part WIM
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-mount.1.in b/doc/man1/wimlib-imagex-mount.1
similarity index 99%
rename from doc/man1/imagex-mount.1.in
rename to doc/man1/wimlib-imagex-mount.1
index e2827cf7138daa08daf99627ed888ce22a2808e2..91313bb4edeee204bbe1870baa3b67e186448913 100644 (file)
--- a/doc/man1/imagex-mount.1.in
+++ b/doc/man1/wimlib-imagex-mount.1
@@ -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
 .SH NAME
 wimlib-imagex-mount, wimlib-imagex-mountrw, wimlib-imagex-unmount \- Mount and unmount an image from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-mountrw.1.in b/doc/man1/wimlib-imagex-mountrw.1
similarity index 100%
rename from doc/man1/imagex-mountrw.1.in
rename to doc/man1/wimlib-imagex-mountrw.1

diff --git a/doc/man1/imagex-optimize.1.in b/doc/man1/wimlib-imagex-optimize.1
similarity index 98%
rename from doc/man1/imagex-optimize.1.in
rename to doc/man1/wimlib-imagex-optimize.1
index 338fdaed091e1f10c906941d5349f7641e03db0c..929abd05bac31d23e81bf23c71336cc0561e26ca 100644 (file)
--- a/doc/man1/imagex-optimize.1.in
+++ b/doc/man1/wimlib-imagex-optimize.1
@@ -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
 .SH NAME
 wimlib-imagex-optimize \- Optimize a WIM archive
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-split.1.in b/doc/man1/wimlib-imagex-split.1
similarity index 95%
rename from doc/man1/imagex-split.1.in
rename to doc/man1/wimlib-imagex-split.1
index fa16abb069e812170fb10da8377757637dad3afe..e84e2f8a7c258ae53d94846b25674a6c69fcd669 100644 (file)
--- a/doc/man1/imagex-split.1.in
+++ b/doc/man1/wimlib-imagex-split.1
@@ -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
 .SH NAME
 wimlib-imagex-split \- Split a WIM into multiple parts
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-unmount.1.in b/doc/man1/wimlib-imagex-unmount.1
similarity index 100%
rename from doc/man1/imagex-unmount.1.in
rename to doc/man1/wimlib-imagex-unmount.1

diff --git a/doc/man1/imagex-update.1.in b/doc/man1/wimlib-imagex-update.1
similarity index 99%
rename from doc/man1/imagex-update.1.in
rename to doc/man1/wimlib-imagex-update.1
index 3ed3feb5eafc87f3045a50e89646a5ee0dce2560..e3a5258b8173b6f38e5f553aa63df4ef71f0dbe6 100644 (file)
--- a/doc/man1/imagex-update.1.in
+++ b/doc/man1/wimlib-imagex-update.1
@@ -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
 .SH NAME
 wimlib-imagex-update \- Update a WIM image
 .SH SYNOPSIS

diff --git a/doc/man1/imagex-verify.1.in b/doc/man1/wimlib-imagex-verify.1
similarity index 96%
rename from doc/man1/imagex-verify.1.in
rename to doc/man1/wimlib-imagex-verify.1
index e6eef9f118f56387de0f26a8c50b9dd006702638..e0b859278c53bc5121f59044e2ee41f35846ff48 100644 (file)
--- a/doc/man1/imagex-verify.1.in
+++ b/doc/man1/wimlib-imagex-verify.1
@@ -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
 .SH NAME
 wimlib-imagex-verify \- Verify a WIM file
 .SH SYNOPSIS

diff --git a/doc/man1/imagex.1.in b/doc/man1/wimlib-imagex.1
similarity index 99%
rename from doc/man1/imagex.1.in
rename to doc/man1/wimlib-imagex.1
index 6ae99b6038ca6f11dfc63230e6a3772cad2a988e..bdea8d938054d2d9d385f503c26111505e3103a9 100644 (file)
--- a/doc/man1/imagex.1.in
+++ b/doc/man1/wimlib-imagex.1
@@ -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
 .SH NAME
 wimlib-imagex \- Extract, create, modify, or mount a WIM (Windows Imaging Format) archive
 .SH SYNOPSIS

diff --git a/update-version b/update-version
index d413f9835c375f6593e172007af51d8e30318293..b15fbfd476a255d1d680ec84adbfcf2ed89e1498 100755 (executable)
--- a/update-version
+++ b/update-version
@@ -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
 
        -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
 
 
 sed -i "s/pkgver=$oldver/pkgver=$newver/" archlinux/PKGBUILD