From 4fc7850a0c618443e3eb636ac5fe2f0e3202451b Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Sat, 8 Sep 2012 15:43:17 -0400 Subject: [PATCH] comerr, cmd, opr: fix library install targets Fix a couple of issues in the install targets following the libtool changes: - don't install liboafs_comerr or liboafs_opr, they're not ready to be exposed to the outside world - fix the libcmd.a install target to use INSTALL_DATA and the correct library name Change-Id: I2bf241cfff419d51bf170fdc871248e9b0c7ab33 Reviewed-on: http://gerrit.openafs.org/8063 Tested-by: BuildBot Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear --- src/cmd/Makefile.in | 2 +- src/comerr/Makefile.in | 1 - src/opr/Makefile.in | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index 4888d977e..f0d2f4c04 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -78,7 +78,7 @@ AFS_component_version_number64.o: AFS_component_version_number.c install: libcmd.a cmd.h ${INSTALL} -d ${DESTDIR}${libdir}/afs ${INSTALL} -d ${DESTDIR}${includedir}/afs - $(LT_INSTALL_DATA) libcmd.la $(DESTDIR)$(libdir)/afs/libcmd.la + ${INSTALL_DATA} libcmd.a ${DESTDIR}$(libdir)/afs/libcmd.a ${INSTALL_DATA} cmd.h ${DESTDIR}${includedir}/afs/cmd.h install64: install libcmd64.a diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 4be49b077..2d6d3e2af 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -67,7 +67,6 @@ install: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a \ ${INSTALL_DATA} ${srcdir}/error_table.h ${DESTDIR}${includedir}/afs/error_table.h ${INSTALL_DATA} ${srcdir}/mit-sipb-cr.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${INSTALL_DATA} libafscom_err.a ${DESTDIR}${libdir}/afs/libafscom_err.a - $(LT_INSTALL_DATA) liboafs_comerr.la $(DESTDIR)$(libdir)liboafs_comerr.la dest: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a ${INSTALL} -d ${DEST}/bin diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in index af3716707..948a14aae 100644 --- a/src/opr/Makefile.in +++ b/src/opr/Makefile.in @@ -57,7 +57,6 @@ clean: rm -f libopr.a install: libopr.a - $(LT_INSTALL_DATA) liboafs_opr.la $(DESTDIR)$(libdir)/liboafs_opr.la $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a $(INSTALL) -d $(DESTDIR)$(includedir)/opr $(INSTALL_DATA) ${srcdir}/queue.h $(DESTDIR)$(includedir)/opr/queue.h -- 2.39.5