ChangeLog, subst.conf.in:
Add substitution for @datadir@
ChangeLog, Makefile.in:
Change to use new installation directory variables convention. Fix
uninstall rules to take $(DESTDIR) into account. Remove cat8dir from
the installdirs target, since modern man package don't necessarily put
the cat directory in /usr/man/cat?.
ChangeLog, .del-types.h.in~7a460879:
types.h.in: Add a signed keyword to the __s64 definition.
diff --git a/resize/ChangeLog b/resize/ChangeLog
index d18e32f..fea200e 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,11 @@
+1998-03-30 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Makefile.in: Change to use new installation directory variables
+ convention. Fix uninstall rules to take $(DESTDIR) into
+ account. Remove cat8dir from the installdirs target,
+ since modern man package don't necessarily put the cat
+ directory in /usr/man/cat?.
+
1998-03-29 Theodore Ts'o <tytso@rsts-11.mit.edu>
* extent.c (extent_cmp): Add const to cast to prevent -Wall warning.
diff --git a/resize/Makefile.in b/resize/Makefile.in
index f4510c8..d25d783 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)$(usbindir) \
- $(DESTDIR)$(man8dir) $(DESTDIR)$(cat8dir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) \
+ $(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
for i in $(PROGS); do \
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(usbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(usbindir)/$$i; \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+ $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done
for i in $(MANPAGES); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
@@ -64,10 +64,10 @@
uninstall:
for i in $(PROGS); do \
- $(RM) -f $(usbindir)/$$i; \
+ $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
done
for i in $(MANPAGES); do \
- $(RM) -f $(man8dir)/$$i; \
+ $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
done
test_extent.out: test_extent $(srcdir)/test_extent.in