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 e5cff67..157421c 100644
--- a/debian/rules
+++ b/debian/rules
@@ -271,13 +271,6 @@
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 45bb67f..1cff0b0 100644
--- 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 6e6cea6..79ae78e 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -50,6 +50,7 @@
$(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 619d296..1c41176 100644
--- 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 2930bbb..9b575d7 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -146,8 +146,11 @@
$(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 @@
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 dec38ce..e5b4e7b 100644
--- 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 feb3fcd..2c20e89 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -132,14 +132,20 @@
$(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 665fbae..012d228 100644
--- 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 6a16a11..bb48ba1 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -153,6 +153,8 @@
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 @@
$(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 @@
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 4c73ed3..5866989 100644
--- 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 ae6d7e0..6a2668f 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -59,6 +59,7 @@
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(MANPAGES); do \
+ $(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done