From 7e44f24237285e809a9f6752e5c960a421e4e998 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 1 Apr 1998 03:16:29 +0000 Subject: [PATCH] ChangeLog, 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?. 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 | 8 ++++++++ debugfs/Makefile.in | 12 ++++++------ e2fsck/ChangeLog | 8 ++++++++ e2fsck/Makefile.in | 17 +++++++++-------- misc/ChangeLog | 8 ++++++++ misc/Makefile.in | 33 +++++++++++++++++---------------- 6 files changed, 56 insertions(+), 30 deletions(-) diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index fa3d50e..bac2536 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,11 @@ +1998-03-31 Theodore Ts'o + + * 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 * debugfs.h: Add declaration for do_dirty_filsys() to prevent diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index b52d9e7..834942b 100644 --- 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 63513a8..7442f7a 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,11 @@ +1998-03-30 Theodore Ts'o + + * 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 * super.c, e2fsck.h: Always declare e2fsck_get_device_size() as an diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 8f12cb6..d93624c 100644 --- 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 69adbba..66591a6 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,11 @@ +1998-03-30 Theodore Ts'o + + * 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 * e2label.8.in: New man page to document the e2label function. diff --git a/misc/Makefile.in b/misc/Makefile.in index a80a5c0..fb56149 100644 --- 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: -- 1.8.3.1