From eda08d45bd984547f87ad3770fad559c7ccede31 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 14 May 2008 18:23:47 -0400 Subject: Install {mkfs,fsck}.{ext4,ext4dev} binary and man pages Signed-off-by: "Theodore Ts'o" --- e2fsck/Makefile.in | 20 ++++++++++++++++++-- e2fsprogs.spec.in | 8 ++++++++ misc/Makefile.in | 23 ++++++++++++++++++----- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index be6dfb7a..8c031d20 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -182,6 +182,12 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs @echo " LINK $(root_sbindir)/fsck.ext3" @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext3 + @echo " LINK $(root_sbindir)/fsck.ext4" + @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4 + @echo " LINK $(root_sbindir)/fsck.ext4dev" + @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4dev @for i in $(MANPAGES); do \ for j in $(COMPRESS_EXT); do \ $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ @@ -202,6 +208,12 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs @echo " LINK $(man8dir)/fsck.ext3.8" @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext3.8 + @echo " LINK $(man8dir)/fsck.ext4.8" + @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4.8 + @echo " LINK $(man8dir)/fsck.ext4.8" + @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4dev.8 install-strip: install @for i in $(PROGS); do \ @@ -214,7 +226,9 @@ uninstall: $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \ done $(RM) -f $(DESTDIR)$(root_sbindir)/fsck.ext2 \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 + $(DESTDIR)$(root_sbindir)/fsck.ext3 \ + $(DESTDIR)$(root_sbindir)/fsck.ext4 \ + $(DESTDIR)$(root_sbindir)/fsck.ext4dev for i in $(MANPAGES); do \ $(RM) -f $(DESTDIR)$(man8dir)/$$i; \ done @@ -222,7 +236,9 @@ uninstall: $(RM) -f $(DESTDIR)$(man5dir)/$$i; \ done $(RM) -f $(DESTDIR)$(root_sbindir)/fsck.ext2 \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 + $(DESTDIR)$(root_sbindir)/fsck.ext3 \ + $(DESTDIR)$(root_sbindir)/fsck.ext4 \ + $(DESTDIR)$(root_sbindir)/fsck.ext4dev clean: $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core e2fsck.static \ diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in index 3e7d1eea..a7cc9754 100644 --- a/e2fsprogs.spec.in +++ b/e2fsprogs.spec.in @@ -119,11 +119,15 @@ exit 0 %{_root_sbindir}/fsck %{_root_sbindir}/fsck.ext2 %{_root_sbindir}/fsck.ext3 +%{_root_sbindir}/fsck.ext4 +%{_root_sbindir}/fsck.ext4dev %{_root_sbindir}/logsave %{_root_sbindir}/mke2fs %{_root_etcdir}/mke2fs.conf %{_root_sbindir}/mkfs.ext2 %{_root_sbindir}/mkfs.ext3 +%{_root_sbindir}/mkfs.ext4 +%{_root_sbindir}/mkfs.ext4dev %{_root_sbindir}/resize2fs %{_root_sbindir}/tune2fs %{_sbindir}/filefrag @@ -156,6 +160,8 @@ exit 0 %{_mandir}/man8/findfs.8* %{_mandir}/man8/fsck.ext2.8* %{_mandir}/man8/fsck.ext3.8* +%{_mandir}/man8/fsck.ext4.8* +%{_mandir}/man8/fsck.ext4dev.8* %{_mandir}/man8/e2image.8* %{_mandir}/man8/e2label.8* %{_mandir}/man8/fsck.8* @@ -163,6 +169,8 @@ exit 0 %{_mandir}/man8/mke2fs.8* %{_mandir}/man8/mkfs.ext2.8* %{_mandir}/man8/mkfs.ext3.8* +%{_mandir}/man8/mkfs.ext4.8* +%{_mandir}/man8/mkfs.ext4dev.8* %{_mandir}/man8/mklost+found.8* %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* diff --git a/misc/Makefile.in b/misc/Makefile.in index b31f5c3e..63a16a31 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -282,6 +282,12 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs @echo " LINK $(root_sbindir)/mkfs.ext3" @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext3 + @echo " LINK $(root_sbindir)/mkfs.ext4" + @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4 + @echo " LINK $(root_sbindir)/mkfs.ext4dev" + @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4dev @echo " LINK $(root_sbindir)/e2label" @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ $(DESTDIR)$(root_sbindir)/e2label @@ -311,6 +317,12 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs @echo " LINK mkfs.ext3.8" @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext3.8 + @echo " LINK mkfs.ext4.8" + @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4.8 + @echo " LINK mkfs.ext4dev.8" + @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 @for i in $(UMANPAGES); do \ for j in $(COMPRESS_EXT); do \ $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \ @@ -352,7 +364,9 @@ uninstall: $(RM) -f $(DESTDIR)$(libdir)/$$i; \ done $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2 \ - $(DESTDIR)$(root_sbindir)/mkfs.ext3 + $(DESTDIR)$(root_sbindir)/mkfs.ext3 \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4 \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4dev for i in $(UPROGS); do \ $(RM) -f $(DESTDIR)$(bindir)/$$i; \ done @@ -360,16 +374,15 @@ uninstall: $(RM) -f $(DESTDIR)$(man8dir)/$$i; \ done $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext3.8 + $(DESTDIR)$(man8dir)/mkfs.ext3.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 for i in $(UMANPAGES); do \ $(RM) -f $(DESTDIR)$(man1dir)/$$i; \ done for i in findfs e2label ; do \ $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \ done - for i in fsck.ext2.8 fsck.ext3.8 ; do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i; \ - done for i in $(FMANPAGES); do \ $(RM) -f $(DESTDIR)$(man5dir)/$$i; \ done -- cgit v1.2.3