ChangeLog, Makefile.in:
Makefile.in (install): Install resize2fs in /sbin, not /usr/sbin.
ChangeLog, unix.c:
unix.c: Also, re-arrange the logic so that we do the time check only
after doing the percentage check, and we only advance the spinner if
we're about to display it.
ChangeLog:
Fix minor wording error in Chagelog.
diff --git a/resize/ChangeLog b/resize/ChangeLog
index 536e721..6fff5db 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-05 <tytso@snap.thunk.org>
+
+ * Makefile.in (install): Install resize2fs in /sbin, not /usr/sbin.
+
2000-06-12 Theodore Ts'o <tytso@valinux.com>
* main.c, resize2fs.c, resize2fs.h, extent.c: Add NLS support.
diff --git a/resize/Makefile.in b/resize/Makefile.in
index aa3a7b8..c833c4f 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -50,13 +50,13 @@
$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
for i in $(PROGS); do \
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
+ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(MANPAGES); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
@@ -64,7 +64,7 @@
uninstall:
for i in $(PROGS); do \
- $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
+ $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(MANPAGES); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i; \