Update makefiles to install mkfs.ext3, and to install man pages for

mkfs.ext2/3 and fsck.ext2/3.  Also remove any compressed man pages
before installing the man pages.

diff --git a/debian/rules b/debian/rules
index e5cff67ace0eef7f6b73d69a0a8125e8f0e51472..157421c3ff94923b53d8cc677db5dc14de7fdd3c 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -271,13 +271,6 @@ binary-arch: install
 
        dh_strip
 
-       dh_link -pe2fsprogs \
-         /usr/share/man/man8/e2fsck.8.gz /usr/share/man/man8/fsck.ext2.8.gz \
-         /usr/share/man/man8/mke2fs.8.gz /usr/share/man/man8/mkfs.ext2.8.gz
-       dh_link -puuid-dev \
-         /usr/share/man/man3/uuid_generate.3.gz /usr/share/man/man3/uuid_generate_random.3.gz \
-         /usr/share/man/man3/uuid_generate.3.gz /usr/share/man/man3/uuid_generate_time.3.gz
-
        dh_compress
        dh_fixperms
 

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 45bb67f3c3510c014a71bf80b11ac9b554c5c122..1cff0b065736f9216aeb72c7d2734181b1c6068d 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-24  Theodore Tso  <tytso@valinux.com>
+
+       * Makefile.in (install): Remove any compressed man pages before
+               installing the man pages.
+
 2002-02-03  Theodore Tso  <tytso@thunk.org>
 
        * Release of E2fsprogs 1.26

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 6e6cea68acf7169b1541dd174ee31bbe36f80a2f..79ae78e778f5565e62fb04b781827d39c7c00963 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -50,6 +50,7 @@ install: $(PROGS) $(MANPAGES) installdirs
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done
        for i in $(MANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
 

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 619d296866147e3d1ef5c1b4138b410cf9de43ac..1c41176fba72618d53cd918afe54fdef066f54f9 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-24  Theodore Tso  <tytso@valinux.com>
+
+       * Makefile.in (install): Install hard links for man pages for
+               fsck.ext2 and fsck.ext3.  Remove any compressed man
+               pages before installing the man pages.
+
 2002-02-22  Theodore Tso  <tytso@valinux.com>
 
        * journal.c: Improve code maintainability and reduce code size by 

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 2930bbbf08ef4cbd1d0552c236c9917b95d8a957..9b575d7bc1c6428a57d009e684abb1801f109791 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -146,8 +146,11 @@ install: $(PROGS) $(MANPAGES) installdirs
        $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
                        $(DESTDIR)$(root_sbindir)/fsck.ext3
        for i in $(MANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
+       $(LN) -f $(DESTDIR)$(man8dir)/fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
+       $(LN) -f $(DESTDIR)$(man8dir)/fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
 
 uninstall:
        for i in $(PROGS); do \
@@ -158,6 +161,8 @@ uninstall:
        for i in $(MANPAGES); do \
                $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
+       $(RM) -f $(DESTDIR)$(root_sbindir)/fsck.ext2 \
+                       $(DESTDIR)$(root_sbindir)/fsck.ext3
 
 clean:
        $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core e2fsck.static \

diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index dec38ce77acdbe59c3de493f3f9360eb3f3cab18..e5b4e7bb27cfcaea7b40f84f5be41a418a1a88be 100644 (file)
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-24  Theodore Tso  <tytso@valinux.com>
+
+       * Makefile.in (install): Install hard links to man pages for
+               uuid_generate_random and uuid_generate_time.  Remove
+               any compressed man pages before installing the man pages.
+
 2002-02-03  Theodore Tso  <tytso@thunk.org>
 
        * Release of E2fsprogs 1.26

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index feb3fcd9f75f002770bad893f1b51e1f83803a4f..2c20e89a1bfae6cbcbfded63399cb242cbd55fb8 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -132,14 +132,20 @@ install:: all installdirs
        $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
        $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
        for i in $(SMANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
        done
+       $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+               $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
+       $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+       $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libuuid.a
        for i in $(SMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man3dir)/$$i; \
        done
+       $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 
 clean::
        $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/*

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 665fbae753ea6a3bd85b7ee7095eaa112b5cec0d..012d228ae14dbef47e5fafbd9efe0339a24a4e40 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-24  Theodore Tso  <tytso@valinux.com>
+
+       * Makefile.in (install): Install hard links for man pages for
+               mkfs.ext2 and mkfs.ext3.  Also install hard link for
+               mkfs.ext3.  Remove any compressed man pages before
+               installing the man pages.
+
 2002-02-23  Theodore Tso  <tytso@valinux.com>
 
        * badblocks.8.in: Clarify man page's description of the -f option

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 6a16a11ee9eba098b5e9428d7f0603f802e6e9dd..bb48ba1869e70127585f77f13685f7b168527f8d 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -153,6 +153,8 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
        done
        $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
                $(DESTDIR)$(root_sbindir)/mkfs.ext2
+       $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+               $(DESTDIR)$(root_sbindir)/mkfs.ext3
        $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
                $(DESTDIR)$(root_sbindir)/e2label
        for i in $(UPROGS); do \
@@ -160,9 +162,15 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
                $(STRIP) $(DESTDIR)$(bindir)/$$i; \
        done
        for i in $(SMANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
+       $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+               $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
+       $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
+       $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
        for i in $(UMANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
        done
 
@@ -173,13 +181,16 @@ uninstall:
        for i in $(USPROGS); do \
                $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
        done
-       $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2
+       $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2 \
+                       $(DESTDIR)$(root_sbindir)/mkfs.ext3
        for i in $(UPROGS); do \
                $(RM) -f $(DESTDIR)$(bindir)/$$i; \
        done
        for i in $(SMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
+       $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8 \
+               $(DESTDIR)$(man8dir)/mkfs.ext3.8
        for i in $(UMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man1dir)/$$i; \
        done

diff --git a/resize/ChangeLog b/resize/ChangeLog
index 4c73ed3004f9668d49927be79625d9414a219177..58669899e67a4fc50fc5257241f1428051ed1a46 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-24  Theodore Tso  <tytso@valinux.com>
+
+       * Makefile.in (install): Remove any compressed man pages before
+               installing the man pages.
+
 2002-02-03  Theodore Tso  <tytso@thunk.org>
 
        * Release of E2fsprogs 1.26

diff --git a/resize/Makefile.in b/resize/Makefile.in
index ae6d7e03c76e45e2c5ed0efffbb45f409cbd3daa..6a2668f1db6cdd0ca73aa6a45accb242db73dc8d 100644 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -59,6 +59,7 @@ install: $(PROGS) $(MANPAGES) installdirs
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done
        for i in $(MANPAGES); do \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done