]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
projects / thirdparty / e2fsprogs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39b5034)
ChangeLog, Makefile.in:
authorTheodore Ts'o <tytso@mit.edu>
Wed, 1 Apr 1998 03:16:29 +0000 (03:16 +0000)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 1 Apr 1998 03:16:29 +0000 (03:16 +0000)
  Change to use new installation directory variables convention.  Fix
  uninstall rules to take $(DESTDIR) into account.  Remove cat8dir and
  cat1dir from the installdirs target, since modern man package don't
  necessarily put the cat directory in /usr/man/cat?.
  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?.
  Change to use new installation directory variables convention.  Fix
  installdirs and uninstall rules to reflect the fact that debugfs has
  been installed in the root filesystem.  Fix uninstall rules to take
  $(DESTDIR) into account.

debugfs/ChangeLog patch | blob | blame | history
debugfs/Makefile.in patch | blob | blame | history
e2fsck/ChangeLog patch | blob | blame | history
e2fsck/Makefile.in patch | blob | blame | history
misc/ChangeLog patch | blob | blame | history
misc/Makefile.in patch | blob | blame | history

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index fa3d50ecba0bca874cf7b515547817989cec9b05..bac25361b4ba57a4b3a2730349adbc7dd8004b06 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,11 @@
+1998-03-31  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Change to use new installation directory variables
+               convention.  Fix installdirs and uninstall rules to reflect
+               the fact that debugfs has been installed in the root
+               filesystem.  Fix uninstall rules to take $(DESTDIR) into
+               account.
+
 1998-03-29  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * debugfs.h: Add declaration for do_dirty_filsys() to prevent
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index b52d9e76ea4fa9565f6e796ff5cebbb074b7ffa3..834942b351487c23e950c731bdef605a9025a7f3 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -40,13 +40,13 @@ debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
        $(SUBSTITUTE) $(srcdir)/debugfs.8.in debugfs.8
 
 installdirs:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(usbindir) \
-               $(DESTDIR)$(man8dir) $(DESTDIR)$(cat8dir)
+       $(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; \
@@ -54,10 +54,10 @@ install: $(PROGS) $(MANPAGES) installdirs
 
 uninstall:
        for i in $(PROGS); do \
-               $(RM) -f $(usbindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
        done
        for i in $(MANPAGES); do \
-               $(RM) -f $(man8dir)/$$i; \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
 
 clean:
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 63513a8037595293dee0122c2f4529cd795164c2..7442f7aaa2e2e54c5523525a709df804a01e40b3 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/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>
 
        * super.c, e2fsck.h: Always declare e2fsck_get_device_size() as an
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 8f12cb65dfcf9e6e36e7119e6a81b53fd593d6ba..d93624ccc63c36c2369a48ebebf43ba8e792a0f4 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -114,26 +114,27 @@ e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
        $(SUBSTITUTE) $(srcdir)/e2fsck.8.in e2fsck.8
 
 installdirs:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir) \
-               $(DESTDIR)$(cat8dir)
+       $(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
-       $(LN) -f $(DESTDIR)$(sbindir)/e2fsck $(DESTDIR)$(sbindir)/fsck.ext2
+       $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+                       $(DESTDIR)$(root_sbindir)/fsck.ext2
        for i in $(MANPAGES); do \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
 
 uninstall:
        for i in $(PROGS); do \
-               $(RM) -f $(sbindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       $(RM) -f $(sbindir)/fsck.ext2
+       $(RM) -f $(DESTDIR)$(root_sbindir)/fsck.ext2
        for i in $(MANPAGES); do \
-               $(RM) -f $(man8dir)/$$i; \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
 
 clean:
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 69adbba1238563dc9dc679b32656779e61b2f1a3..66591a652a7dc45114ede2c6956e2cf3bf2fc2d3 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/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 and cat1dir 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>
 
        * e2label.8.in: New man page to document the e2label function.
diff --git a/misc/Makefile.in b/misc/Makefile.in
index a80a5c0879817b50733396f2d7fbd66b61377b5e..fb56149ea81b6e2c3f73a1d8686af8cfb445849a 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -109,23 +109,24 @@ lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in
        $(SUBSTITUTE) $(srcdir)/lsattr.1.in lsattr.1 
 
 installdirs:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) \
-               $(DESTDIR)$(ubindir) $(DESTDIR)$(man1dir) \
-               $(DESTDIR)$(cat1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(cat8dir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) \
+               $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
+               $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
 
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
        for i in $(SPROGS); 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 $(USPROGS); do \
-               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(usbindir)/$$i; \
-               $(STRIP) $(DESTDIR)$(usbindir)/$$i; \
+               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+               $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
        done
-       $(LN) -f $(DESTDIR)$(sbindir)/mke2fs $(DESTDIR)$(sbindir)/mkfs.ext2
+       $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+               $(DESTDIR)$(root_sbindir)/mkfs.ext2
        for i in $(UPROGS); do \
-               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ubindir)/$$i; \
-               $(STRIP) $(DESTDIR)$(ubindir)/$$i; \
+               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
+               $(STRIP) $(DESTDIR)$(bindir)/$$i; \
        done
        for i in $(SMANPAGES); do \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
@@ -136,20 +137,20 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
 
 uninstall:
        for i in $(SPROGS); do \
-               $(RM) -f $(sbindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
        done
        for i in $(USPROGS); do \
-               $(RM) -f $(usbindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
        done
-       $(RM) -f $(sbindir)/mkfs.ext2
+       $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2
        for i in $(UPROGS); do \
-               $(RM) -f $(ubindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(bindir)/$$i; \
        done
        for i in $(SMANPAGES); do \
-               $(RM) -f $(man8dir)/$$i; \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
        for i in $(UMANPAGES); do \
-               $(RM) -f $(man1dir)/$$i; \
+               $(RM) -f $(DESTDIR)$(man1dir)/$$i; \
        done
 
 clean:
Unnamed repository; edit this file 'description' to name the repository.