diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index be58e30..62d9d95 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 Sun Mar  8 22:17:59 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* gen_uuid.c (get_node_id): Use char * instead of caddr_t, which
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index a186f2a..20f6c78 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -46,19 +46,19 @@
 DLL_IMAGE = libuuid
 DLL_STUB = libuuid
 DLL_MYDIR = uuid
-DLL_INSTALL_DIR = $(libdir)
+DLL_INSTALL_DIR = $(root_libdir)
 
 ELF_VERSION = 1.1
 ELF_SO_VERSION = 1
 ELF_IMAGE = libuuid
 ELF_MYDIR = uuid
-ELF_INSTALL_DIR = $(libdir)
+ELF_INSTALL_DIR = $(root_libdir)
 ELF_OTHER_LIBS = -lc
 
 BSDLIB_VERSION = 1.0
 BSDLIB_IMAGE = libuuid
 BSDLIB_MYDIR = uuid
-BSDLIB_INSTALL_DIR = $(libdir)
+BSDLIB_INSTALL_DIR = $(root_libdir)
 
 @MAKEFILE_LIBRARY@
 @MAKEFILE_DLL@
@@ -85,18 +85,18 @@
 	$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(LIBUUID)
 
 installdirs::
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ulibdir)  \
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)  \
 		$(DESTDIR)$(includedir)/uuid
 
 install:: all installdirs 
-	$(INSTALL_DATA) libuuid.a $(DESTDIR)$(ulibdir)/libuuid.a
-	$(CHMOD) 644 $(DESTDIR)$(ulibdir)/libuuid.a
-	-$(RANLIB) $(DESTDIR)$(ulibdir)/libuuid.a
-	$(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/libuuid.a
+	$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+	$(CHMOD) 644 $(DESTDIR)$(libdir)/libuuid.a
+	-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
 	$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
 
 uninstall::
-	$(RM) -f $(ulibdir)/libuuid.a
+	$(RM) -f $(DESTDIR)$(libdir)/libuuid.a
 
 clean::
 	$(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/*