From 55609b28f1976ac27e157ccb12135fe5103d4d0c Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 8 Jan 2009 16:25:04 +0200
Subject: [PATCH] Fixed libtool installation: always use --mode=install

---
 doc/Makefile.ad      |  2 +-
 lib/Makefile.ad      | 14 +++++++-------
 silc-toolkit.spec.in |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index 1818fc1c..ffddd019 100644
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -89,7 +89,7 @@ doc-install:
 #endif SILC_DIST_TOOLKIT
 	-$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
 	-$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/
-	-$(INSTALL_DATA) $(top_srcdir)/CHANGES $(docdir)/
+	-$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(docdir)/
 	-$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/
 	-$(INSTALL_DATA) $(top_srcdir)/README* $(docdir)/
 	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index df6fa0a5..59e5457e 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -103,12 +103,12 @@ all:
 #ifdef SILC_DIST_TOOLKIT
 install-exec-hook:
 	-mkdir -p $(DESTDIR)$(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
 #ifdef SILC_DIST_CLIENTLIB
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 #endif SILC_DIST_CLIENTLIB
 #ifdef SILC_DIST_SERVERLIB
-	-$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
 #endif SILC_DIST_SERVERLIB
 #else !SILC_DIST_TOOLKIT
 
@@ -116,8 +116,8 @@ install-exec-hook:
 install-exec-hook:
 if SILC_ENABLE_SHARED
 	-mkdir -p $(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-	-$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
 	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
 	-rm -rf $(DESTDIR)$(libdir)/libsilcserver.a
 endif
@@ -127,8 +127,8 @@ endif
 install-exec-hook:
 if SILC_ENABLE_SHARED
 	-mkdir -p $(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
 	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
 endif
diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
index ea620ba8..8b4fe781 100644
--- a/silc-toolkit.spec.in
+++ b/silc-toolkit.spec.in
@@ -63,11 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %_libdir/silc/modules
 %{_libdir}/silc/modules/*.so
 %defattr(0644, root, root, 0755)
-%doc CHANGES COPYING GPL BSD
+%doc ChangeLog COPYING GPL BSD
 
 %files devel
 %defattr(0644, root, root, 0755)
-%doc CHANGES COPYING GPL BSD doc/toolkit
+%doc ChangeLog COPYING GPL BSD doc/toolkit
 %{_libdir}/libsilc.so
 %{_libdir}/libsilc.*a
 %{_libdir}/libsilcclient.so
-- 
2.24.0