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 <simonxwilkinson@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 4033a8084cb5b743a4347611c51a7a6c9fbfcd7b..c0d2eb5951af751b463942e95e66400415e1bee0 100644 (file)
--- 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 97f1cc573684d6c85561464318024ce4f13b772b..cf77bf1285050c9fcbe86eb191e0b4d3ec7c3f5b 100644 (file)
--- 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 60b37bf73fab29e9c9c9ad7bb45083ed50523c5e..f52ebeb8d217d692942a5fa65f73d5982ad9235d 100644 (file)
--- 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