Fix "make uninstall" to make sure it removes everything that is installed.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index b15c4ef51cc1c551281dfb4b81eaa108fd167c25..9fe90f2e3857cfb1459b817ce245456ce1eea80a 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,6 +1,11 @@
+2005-01-26  Theodore Ts'o  <tytso@mit.edu>
+
+       * Makefile.in (uninstall-shlibs): Fix "make uninstall"  by adding
+               an uninstall-shlibs target.
+
 2004-12-14  Theodore Ts'o  <tytso@mit.edu>
 
-       * Add install-shlib-strip target.  Update Makefile.in to version
+       * Add install-shlibs-strip target.  Update Makefile.in to version
                from gettext 0.14.1
 
 2004-11-30  Theodore Ts'o  <tytso@mit.edu>

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 5bb5f58d1b33e984577c069368a2ed8b1d740fc2..7662781b345d77320a218aa5ecd5d23171e8223c 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -376,6 +376,8 @@ installcheck:
 
 install-shlibs:
 
+uninstall-shlibs:
+
 install-shlibs-strip:
 
 uninstall:

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 225ed12ba4edb5c5e6ffbabaaa21e91fd1ec74de..147bb1a609e91a013df374920ffa0cee1f839880 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-26  Theodore Ts'o  <tytso@mit.edu>
+
+       * Makefile.library (uninstall-shlibs): Fix "make uninstall"
+
 2004-12-14  Theodore Ts'o  <tytso@mit.edu>
 
        * Makefile.elf-lib, Makefile.solaris-lib, Makefile.profile,

diff --git a/lib/Makefile.library b/lib/Makefile.library
index 585e1466fe26fcc06ac39073352a66a4a87adce0..5cff608dc8a336f5efc0bc3e7403efd875a49e8a 100644 (file)
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -2,6 +2,8 @@ all:: subdirs $(LIBRARY).a
 
 install-shlibs::
 
+uninstall-shlibs::
+
 subdirs::
 
 $(LIBRARY).a: $(OBJS)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index ba99457edd6c30a99522c6f474bad04058eaebd8..1372ba642b84b0548ff4b9ffea71ad5c302ea6d2 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,8 @@
 2005-01-26  Theodore Ts'o  <tytso@mit.edu>
 
+       * Makefile.in (uninstall): Make sure "make uninstall" removes
+               everything installed by the makefile.
+
        * e2image.c (scramble_dir_block): Make sure the unused space
                in the '.' and '..' directory entries are cleared when
                e2image -rs is specified.

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 95af35618fdc4a2d69041151a34717a7f345ab31..29afcb3cc94b1636802af836e8839dd36939eaa6 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -283,6 +283,9 @@ uninstall:
        for i in $(USPROGS); do \
                $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
        done
+       for i in $(LPROGS); do \
+               $(RM) -f $(DESTDIR)$(libdir)/$$i; \
+       done
        $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2 \
                        $(DESTDIR)$(root_sbindir)/mkfs.ext3
        for i in $(UPROGS); do \
@@ -296,6 +299,12 @@ uninstall:
        for i in $(UMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man1dir)/$$i; \
        done
+       for i in findfs e2label ; do \
+               $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
+       done
+       for i in fsck.ext2.8 fsck.ext3.8 ; do \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
+       done
 
 clean:
        $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \