comerr, cmd, opr: fix library install targets
authorMarc Dionne <marc.c.dionne@gmail.com>
Sat, 8 Sep 2012 19:43:17 +0000 (15:43 -0400)
committerDerrick Brashear <shadow@your-file-system.com>
Sun, 9 Sep 2012 03:30:17 +0000 (20:30 -0700)
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 <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

src/cmd/Makefile.in
src/comerr/Makefile.in
src/opr/Makefile.in

index 4888d97..f0d2f4c 100644 (file)
@@ -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
index 4be49b0..2d6d3e2 100644 (file)
@@ -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
index af37167..948a14a 100644 (file)
@@ -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