Revert "Makefile.PL: use MAN1PODS to build and install manpages"

This reverts commit 86d0f72ba700b7e13e42e0660695d2cda02e7f66 (mostly)

Caused lintian warnings about manpage sections being 1p instead of 1

diff --git a/.gitignore b/.gitignore
index dbad210..f4f20a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.so
 *.so.*
 *.dylib
+*.1
 zgz/zgz
 pit/suse-bzip2/bzip2
 Makefile

diff --git a/Makefile.PL b/Makefile.PL
index 2d30ef0..23175a9 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,6 +14,11 @@ pure_install:: extra_install
 ZGZ_LIB=$(PREFIX)/lib/zgz
 
 extra_build: zgz/zgz pristine-tar.spec
+       pod2man -c pristine-tar pristine-tar > pristine-tar.1
+       pod2man -c pristine-gz  pristine-gz  > pristine-gz.1
+       pod2man -c pristine-bz2 pristine-bz2 > pristine-bz2.1
+       pod2man -c pristine-xz pristine-xz > pristine-xz.1
+       pod2man -c zgz zgz/zgz.pod > zgz.1
        $(MAKE) -C pit/suse-bzip2 PREFIX=$(PREFIX)
 
 ZGZ_SOURCES = zgz/zgz.c zgz/gzip/*.c zgz/old-bzip2/*.c
@@ -23,6 +28,8 @@ zgz/zgz: $(ZGZ_SOURCES)
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/bin
        install zgz/zgz $(DESTDIR)$(PREFIX)/bin
+       install -d $(DESTDIR)$(PREFIX)/share/man/man1
+       install -m 0644 *.1 $(DESTDIR)$(PREFIX)/share/man/man1
        install -d $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
        install pit/suse-bzip2/bzip2 $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
        install pit/suse-bzip2/libbz2* $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
@@ -44,13 +51,7 @@ WriteMakefile(
        ABSTRACT        =>
                'regenerate a pristine upstream tarball using only a small '.
                'binary delta file and a revision control checkout',
-       MAN1PODS        => {
-               'pristine-tar' => '$(INST_MAN1DIR)/pristine-tar.1',
-               'pristine-bz2' => '$(INST_MAN1DIR)/pristine-bz2.1',
-               'pristine-gz'  => '$(INST_MAN1DIR)/pristine-gz.1',
-               'pristine-xz'  => '$(INST_MAN1DIR)/pristine-xz.1',
-               'zgz/zgz.pod'  => '$(INST_MAN1DIR)/zgz.1'
-       },
+       MAN1PODS        => {},
        MAN3PODS        => {},
        PMLIBDIRS       => ["Pristine"],
        EXE_FILES       => ["pristine-tar","pristine-bz2","pristine-gz","pristine-xz"],