From b52d0b50ff4a8026eb4043898d8f070f960e511d Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Sat, 15 Sep 2012 16:02:26 -0400 Subject: [PATCH] make install fixes for libraries Don't install several libraries that have dependencies that are not currently installed, but install static libraries. Fix rule for libafsauthent_pic.a to get the library from .libs Change-Id: I746b111edf8a6d94ad98fcf235e34b4dac1eb050 Reviewed-on: http://gerrit.openafs.org/8123 Reviewed-by: Simon Wilkinson Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/libafsauthent/Makefile.in | 6 +++--- src/libafsrpc/Makefile.in | 4 ++-- src/ubik/Makefile.in | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 4033a8084..c0d2eb595 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -51,10 +51,10 @@ clean: $(LT_CLEAN) $(RM) -f *.o libafsauthent.a -install: libafsauthent.la libafsauthent_pic.la +install: libafsauthent.a libafsauthent_pic.la ${INSTALL} -d ${DESTDIR}${libdir} - ${LT_INSTALL_DATA} libafsauthent.la ${DESTDIR}${libdir}/libafsauthent.la - ${INSTALL_DATA} libafsauthent_pic.a ${DESTDIR}${libdir}/libafsauthent_pic.a + ${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/libafsauthent.a + ${INSTALL_DATA} .libs/libafsauthent_pic.a ${DESTDIR}${libdir}/libafsauthent_pic.a dest: libafsauthent.a ${INSTALL} -d ${DEST}/lib diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 97f1cc573..cf77bf128 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -58,9 +58,9 @@ ${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a ${TOP_LIBDIR}/libafsrpc_pic.a: libafsrpc_pic.la ${INSTALL_DATA} .libs/libafsrpc_pic.a $@ -install: libafsrpc.la libafsrpc_pic.la +install: libafsrpc.a libafsrpc_pic.la ${INSTALL} -d ${DESTDIR}${libdir} - ${LT_INSTALL_DATA} libafsrpc.la ${DESTDIR}${libdir}/libafsrpc.la + $(INSTALL_DATA) libafsrpc.a $(DESTDIR)$(libdir)/libafsrpc.a $(INSTALL_DATA) .libs/libafsrpc_pic.a $(DESTDIR)$(libdir)/libafsrpc_pic.a dest: libafsrpc.a diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 60b37bf73..f52ebeb8d 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -151,7 +151,6 @@ install: libubik.a ubik.h ubik_int.h udebug ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} -d ${DESTDIR}${afssrvbindir} ${INSTALL_DATA} libubik.a ${DESTDIR}${libdir}/libubik.a - $(LT_INSTALL_DATA) liboafs_ubik.la $(DESTDIR)$(libdir)/liboafs_ubik.la ${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h ${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h ${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug -- 2.39.5