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/include/linux/ChangeLog b/include/linux/ChangeLog
index 256687a..afb2828 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+1998-03-30  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * types.h.in: Add a signed keyword to the __s64 definition.
+
 1998-03-23  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * ext2_fs.h: Update to latest 2.1.90+diffs version of ext2_fs.h

diff --git a/include/linux/types.h.in b/include/linux/types.h.in
index ee5f24d..19ed906 100644 (file)
--- a/include/linux/types.h.in
+++ b/include/linux/types.h.in
@@ -11,7 +11,7 @@ typedef unsigned int  __u64;
 typedef long           __s64;
 typedef unsigned long  __u64;
 #elif (@SIZEOF_LONG_LONG@ == 8)
-typedef long long      __s64;
+typedef __signed__ long long   __s64;
 typedef unsigned long long     __u64;
 #endif
 

diff --git a/resize/ChangeLog b/resize/ChangeLog
index d18e32f..fea200e 100644 (file)
--- 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 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -50,13 +50,13 @@ test_extent: $(TEST_EXTENT_OBJS)
        $(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 @@ install: $(PROGS) $(MANPAGES) installdirs
 
 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

diff --git a/util/ChangeLog b/util/ChangeLog
index 8837921..b5ba2df 100644 (file)
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+1998-03-31  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * subst.conf.in: Add substitution for @datadir@
+
 Mon Jan 19 09:25:24 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * subst.c: Rename "new" to "new_f" to avoid C++ reserved word

diff --git a/util/subst.conf.in b/util/subst.conf.in
index 9108659..355f169 100644 (file)
--- a/util/subst.conf.in
+++ b/util/subst.conf.in
@@ -9,3 +9,4 @@ SIZEOF_LONG_LONG        @SIZEOF_LONG_LONG@
 SIZEOF_LONG            @SIZEOF_LONG@
 SIZEOF_INT             @SIZEOF_INT@
 SIZEOF_SHORT           @SIZEOF_SHORT@
+datadir                        @datadir@