From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 19 May 2001 22:07:36 +0000 (+0000)
Subject: Many files:
X-Git-Tag: E2FSPROGS-1_20~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20562a48a57c521a2853cf839abe8d754ba844e0;p=thirdparty%2Fe2fsprogs.git

Many files:
  Makefile.bsd-lib, Makefile.dll-lib, Makefile.elf-lib,
  	Makefile.solaris-lib: Use $(LDCONFIG) instead of -ldconfig.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 57bfccb89..da6f413f3 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-19  Theodore Tso  <tytso@valinux.com>
+
+	* Makefile.bsd-lib, Makefile.dll-lib, Makefile.elf-lib,
+		Makefile.solaris-lib: Use $(LDCONFIG) instead of -ldconfig.
+
 2000-07-13    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.19
diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib
index 9e73a8e91..38f22da38 100644
--- a/lib/Makefile.bsd-lib
+++ b/lib/Makefile.bsd-lib
@@ -1,5 +1,5 @@
 #
-# This is a Makefile stub which handles the creation of Linux BSD shared
+# This is a Makefile stub which handles the creation of BSD shared
 # libraries.
 #
 # In order to use this stub, the following makefile variables must be defined.
@@ -30,7 +30,7 @@ $(BSD_LIB): $(OBJS)
 install-shlibs install:: $(BSD_LIB)
 	$(INSTALL_PROGRAM) $(BSD_LIB) \
 		$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
-	-ldconfig
+	-$(LDCONFIG)
 
 uninstall-shlibs uninstall::
 	$(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
diff --git a/lib/Makefile.dll-lib b/lib/Makefile.dll-lib
index 61e40cc4d..bac0c7eb1 100644
--- a/lib/Makefile.dll-lib
+++ b/lib/Makefile.dll-lib
@@ -82,7 +82,7 @@ install-shlibs install:: $(DLL_IMAGE).so.$(DLL_VERSION) installdirs
 	$(INSTALL_PROGRAM) $(DLL_IMAGE).so.$(DLL_VERSION) \
 		$(DESTDIR)$(DLL_INSTALL_DIR)/$(DLL_IMAGE).so.$(DLL_VERSION)
 	$(STRIP) $(DESTDIR)$(DLL_INSTALL_DIR)/$(DLL_IMAGE).so.$(DLL_VERSION)
-	-ldconfig
+	-$(LDCONFIG)
 
 uninstall-shlibs unistall::
 	$(RM) $(DESTDIR)$(DLL_INSTALL_DIR)/$(DLL_IMAGE).so.$(DLL_VERSION)
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index e755d20c6..864a9c40b 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -45,13 +45,13 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
 	$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
 	$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-	-ldconfig
+	-$(LDCONFIG)
 
 uninstall-shlibs uninstall::
 	$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
 		$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-	-ldconfig
+	-$(LDCONFIG)
 
 clean::
 	$(RM) -rf elfshared
diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index 94e4d33e7..6b0db124d 100644
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -45,13 +45,13 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
 	$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
 	$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-	-ldconfig
+	-$(LDCONFIG)
 
 uninstall-shlibs uninstall::
 	$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
 		$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
-	-ldconfig
+	-$(LDCONFIG)
 
 clean::
 	$(RM) -rf elfshared