From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 29 Dec 2002 21:27:07 +0000 (+0000)
Subject: 	Library install fix.
X-Git-Tag: silc.client.0.9.11~10
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=62ec5173270310c8fc1efaa1ffdd922e4646ed1a;p=silc.git

	Library install fix.
---

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 5388c8a9..fc4c1505 100644
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -71,17 +71,17 @@ remove:
 
 if SILC_DIST_TOOLKIT
 install-exec-hook:
-	-mkdir -p $(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(libdir)/
+	-mkdir -p $(DESTDIR)$(libdir)
+	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 else
 install-exec-hook:
 	-mkdir -p $(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/
-	-rm -rf $(libdir)/libsilc.a
+	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
 if SILC_DIST_CLIENT
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(libdir)/
-	-rm -rf $(libdir)/libsilcclient.a
+	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
 endif
 endif
 
@@ -111,13 +111,13 @@ libsilc.a:
 	find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
 	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE) \
-	-release $(LIB_BASE_VERSION) -rpath $(libdir) -o libsilc.la
+	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
 
 libsilcclient.a:
 	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
 	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE) \
-	-release $(LIB_BASE_VERSION) -rpath $(libdir) -o libsilcclient.la
+	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
 
 if SILC_DIST_TOOLKIT
 SILC_EXTRA_DIST = doc