Many files:

  Change to use new installation directory variables convention.  Add
  uninstall rules.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b77f8eb..4940401 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+1998-03-31  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.bsd-lib, Makefile.dll-lib, Makefile.elf-lib,
+               Makefile.profile: Change to use new installation directory
+               variables convention.  Add uninstall rules.
+
 1998-03-28  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Makefile.elf-lib (installdirs): Change use of DLL_INSTALL_DIR to

diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib
index e0227a2..9e73a8e 100644 (file)
--- a/lib/Makefile.bsd-lib
+++ b/lib/Makefile.bsd-lib
@@ -28,9 +28,13 @@ $(BSD_LIB): $(OBJS)
        $(LN) $(BSD_LIB) ../$(BSD_LIB)
 
 install-shlibs install:: $(BSD_LIB)
-       $(INSTALL_PROGRAM) $(BSD_LIB) $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
+       $(INSTALL_PROGRAM) $(BSD_LIB) \
+               $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
        -ldconfig
 
+uninstall-shlibs uninstall::
+       $(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
+
 clean::
        $(RM) -rf pic
        $(RM) -f $(BSD_LIB)

diff --git a/lib/Makefile.dll-lib b/lib/Makefile.dll-lib
index 8bcf121..61e40cc 100644 (file)
--- a/lib/Makefile.dll-lib
+++ b/lib/Makefile.dll-lib
@@ -84,11 +84,14 @@ install-shlibs install:: $(DLL_IMAGE).so.$(DLL_VERSION) installdirs
        $(STRIP) $(DESTDIR)$(DLL_INSTALL_DIR)/$(DLL_IMAGE).so.$(DLL_VERSION)
        -ldconfig
 
+uninstall-shlibs unistall::
+       $(RM) $(DESTDIR)$(DLL_INSTALL_DIR)/$(DLL_IMAGE).so.$(DLL_VERSION)
+
 install:: $(DLL_STUB).sa
-       $(INSTALL_DATA) $(DLL_STUB).sa $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
-       $(CHMOD) 644 $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
-       $(RANLIB) $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
-       $(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
+       $(INSTALL_DATA) $(DLL_STUB).sa $(DESTDIR)$(libdir)/$(DLL_STUB).sa
+       $(CHMOD) 644 $(DESTDIR)$(libdir)/$(DLL_STUB).sa
+       $(RANLIB) $(DESTDIR)$(libdir)/$(DLL_STUB).sa
+       $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(DLL_STUB).sa
 
 clean::
        $(RM) -f ../$(DLL_STUB).sa $(DLL_STUB).sa \

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index de38bfd..e755d20 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -34,7 +34,7 @@ $(ELF_LIB): $(OBJS)
 
 installdirs-elf-lib::
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) \
-               $(DESTDIR)$(ulibdir)
+               $(DESTDIR)$(libdir)
 
 installdirs:: installdirs-elf-lib
 
@@ -44,7 +44,13 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
                $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
        $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
        $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-               $(DESTDIR)$(ulibdir)/$(ELF_IMAGE).so
+               $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+       -ldconfig
+
+uninstall-shlibs uninstall::
+       $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
+               $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+               $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
        -ldconfig
 
 clean::

diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index 0864fac..674cac7 100644 (file)
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -17,7 +17,10 @@ $(LIBRARY)_p.a: $(OBJS)
        $(LN) $@ ../$@
 
 install:: $(LIBRARY)_p.a installdirs
-       $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
-       $(CHMOD) 644 $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
-       -$(RANLIB) $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
-       $(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
+       $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       $(CHMOD) 644 $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       -$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+
+uninstall::
+       $(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY)_p.a