Index: e2fsprogs-1.41.1/debugfs/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/debugfs/Makefile.in 2008-09-12 13:11:54.312141153 -0500 +++ e2fsprogs-1.41.1/debugfs/Makefile.in 2008-09-12 13:12:04.463139863 -0500 @@ -57,17 +57,13 @@ installdirs: $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs - @for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done - @for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man8dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ - done + echo " INSTALL $(root_sbindir)/debuge4fs"; \ + $(INSTALL_PROGRAM) debugfs $(DESTDIR)$(root_sbindir)/debuge4fs; \ + for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man8dir)/debugfs.$$j; \ + done; \ + echo " INSTALL_DATA $(man8dir)/debuge4fs.8"; \ + $(INSTALL_DATA) debugfs.8 $(DESTDIR)$(man8dir)/debuge4fs.8; \ install-strip: install @for i in $(PROGS); do \ Index: e2fsprogs-1.41.1/e2fsck/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-09-12 13:11:54.313140235 -0500 +++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-12 13:12:04.464139767 -0500 @@ -192,47 +192,29 @@ installdirs: $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs - @for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done - @echo " LINK $(root_sbindir)/fsck.ext2" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext2 - @echo " LINK $(root_sbindir)/fsck.ext3" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 + echo " INSTALL $(root_sbindir)/e4fsck"; + $(INSTALL_PROGRAM) e2fsck $(DESTDIR)$(root_sbindir)/e4fsck; @echo " LINK $(root_sbindir)/fsck.ext4" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + @$(LN) -f $(DESTDIR)$(root_sbindir)/e4fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext4 @echo " LINK $(root_sbindir)/fsck.ext4dev" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + @$(LN) -f $(DESTDIR)$(root_sbindir)/e4fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext4dev - @for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man8dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ - done - @for i in $(FMANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man5dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ - done - @echo " LINK $(man8dir)/fsck.ext2.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext2.8 - @echo " LINK $(man8dir)/fsck.ext3.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext3.8 + @for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man8dir)/e4fsck.8.$$j; \ + done; + @echo " INSTALL_DATA $(man8dir)/e4fsck.8"; + $(INSTALL_DATA) e2fsck.8 $(DESTDIR)$(man8dir)/e4fsck.8; + @for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man5dir)/e4fsck.conf.5.$$j; \ + done; + @echo " INSTALL_DATA $(man5dir)/e4fsck.conf.5"; + $(INSTALL_DATA) e2fsck.conf.5 $(DESTDIR)$(man5dir)/e4fsck.conf.5; @echo " LINK $(man8dir)/fsck.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + @$(LN) -f $(DESTDIR)$(man8dir)/e4fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext4.8 @echo " LINK $(man8dir)/fsck.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + @$(LN) -f $(DESTDIR)$(man8dir)/e4fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext4dev.8 install-strip: install Index: e2fsprogs-1.41.1/misc/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/misc/Makefile.in 2008-09-12 13:11:54.347135497 -0500 +++ e2fsprogs-1.41.1/misc/Makefile.in 2008-09-12 13:12:33.196077130 -0500 @@ -280,102 +280,67 @@ installdirs: $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) install: all $(SMANPAGES) $(UMANPAGES) installdirs - @for i in $(SPROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done - @for i in $(USPROGS); do \ - echo " INSTALL $(sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ - done - @echo " LINK $(root_sbindir)/mkfs.ext2" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext2 - @echo " LINK $(root_sbindir)/mkfs.ext3" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext3 + @echo " INSTALL $(root_sbindir)/mke4fs"; + $(INSTALL_PROGRAM) mke2fs $(DESTDIR)$(root_sbindir)/mke4fs; + @echo " INSTALL $(root_sbindir)/tune4fs"; + $(INSTALL_PROGRAM) tune2fs $(DESTDIR)$(root_sbindir)/tune4fs; + @echo " INSTALL $(root_sbindir)/dumpe4fsi"; + $(INSTALL_PROGRAM) dumpe2fs $(DESTDIR)$(root_sbindir)/dumpe4fs; + @echo " INSTALL $(root_sbindir)/e4image"; + $(INSTALL_PROGRAM) e2image $(DESTDIR)$(root_sbindir)/e4image; + @echo " INSTALL $(root_sbindir)/e4undo"; + $(INSTALL_PROGRAM) e2undo $(DESTDIR)$(root_sbindir)/e4undo; + @echo " LINK $(root_sbindir)/mkfs.ext4" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + @$(LN) -f $(DESTDIR)$(root_sbindir)/mke4fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext4 @echo " LINK $(root_sbindir)/mkfs.ext4dev" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + @$(LN) -f $(DESTDIR)$(root_sbindir)/mke4fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext4dev - @echo " LINK $(root_sbindir)/e2label" - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ - $(DESTDIR)$(root_sbindir)/e2label - @echo " LINK $(root_sbindir)/findfs" - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ - $(DESTDIR)$(root_sbindir)/findfs - @for i in $(UPROGS); do \ - echo " INSTALL $(bindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ - done - @for i in $(LPROGS); do \ - echo " INSTALL $(libdir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \ - done + @echo " LINK $(root_sbindir)/e4label" + @$(LN) -f $(DESTDIR)$(root_sbindir)/tune4fs \ + $(DESTDIR)$(root_sbindir)/e4label + @echo " LINK $(root_sbindir)/finde4fs" + @$(LN) -f $(DESTDIR)$(root_sbindir)/tune4fs \ + $(DESTDIR)$(root_sbindir)/finde4fs @for i in $(SMANPAGES); do \ for j in $(COMPRESS_EXT); do \ $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ done; \ - echo " INSTALL_DATA $(man8dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ done - @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ - $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz - @echo " LINK mkfs.ext2.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext2.8 - @echo " LINK mkfs.ext3.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext3.8 + @echo " INSTALL_DATA $(man8dir)/tune4fs.8"; + $(INSTALL_DATA) tune2fs.8 $(DESTDIR)$(man8dir)/tune4fs.8; + @echo " INSTALL_DATA $(man8dir)/mke4fs.8"; + $(INSTALL_DATA) mke2fs.8 $(DESTDIR)$(man8dir)/mke4fs.8; + @echo " INSTALL_DATA $(man8dir)/dumpe4fs.8"; + $(INSTALL_DATA) dumpe2fs.8 $(DESTDIR)$(man8dir)/dumpe4fs.8; + @echo " INSTALL_DATA $(man8dir)/e4label.8"; + $(INSTALL_DATA) e2label.8 $(DESTDIR)$(man8dir)/e4label.8; + @echo " INSTALL_DATA $(man8dir)/e4image.8"; + $(INSTALL_DATA) e2image.8 $(DESTDIR)$(man8dir)/e4image.8; + @echo " INSTALL_DATA $(man8dir)/e4undo.8"; + $(INSTALL_DATA) e2undo.8 $(DESTDIR)$(man8dir)/e4undo.8; + + @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext4.8.gz \ + $(DESTDIR)$(man8dir)/mkfs.ext4dev.8.gz @echo " LINK mkfs.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + @$(LN) -f $(DESTDIR)$(man8dir)/mke4fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext4.8 @echo " LINK mkfs.ext4dev.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + @$(LN) -f $(DESTDIR)$(man8dir)/mke4fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 - @for i in $(UMANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man1dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \ - done + @for i in $(FMANPAGES); do \ for j in $(COMPRESS_EXT); do \ $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \ done; \ - echo " INSTALL_DATA $(man5dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done - @if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \ - if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - $(srcdir)/mke2fs.conf; then \ - true; \ - else \ - if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \ - echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - $(INSTALL_DATA) $(srcdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \ - echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \ - else \ - echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \ - $(INSTALL_DATA) $(srcdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - echo "Your mke2fs.conf is too old. Backing up old version in"; \ - echo "$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old. Please check to see"; \ - echo "if you have any local customizations that you wish to preserve."; \ - fi; \ - echo " "; \ - fi; \ - else \ - echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ + @echo " INSTALL_DATA $(man5dir)/mke4fs.conf.5"; + $(INSTALL_DATA) mke2fs.conf.5 $(DESTDIR)$(man5dir)/mke4fs.conf.5; + @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke4fs.conf; then \ + echo " INSTALL_DATA $(root_sysconfdir)/mke4fs.conf"; \ $(INSTALL_DATA) $(srcdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ + $(DESTDIR)$(root_sysconfdir)/mke4fs.conf; \ fi install-strip: install Index: e2fsprogs-1.41.1/resize/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/resize/Makefile.in 2008-09-12 13:11:54.372199399 -0500 +++ e2fsprogs-1.41.1/resize/Makefile.in 2008-09-12 13:12:04.507456301 -0500 @@ -62,17 +62,13 @@ installdirs: $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs - @for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done - @for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man8dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ - done + echo " INSTALL $(root_sbindir)/resize4fs"; + $(INSTALL_PROGRAM) resize2fs $(DESTDIR)$(root_sbindir)/resize4fs; + for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man8dir)/resize2fs.8.$$j; \ + done; + @echo " INSTALL_DATA $(man8dir)/resize4fs.8"; + $(INSTALL_DATA) resize2fs.8 $(DESTDIR)$(man8dir)/resize4fs.8; install-strip: install @for i in $(PROGS); do \