--- a/components/desktop/libotr/Makefile Fri Jan 15 19:55:20 2016 -0800
+++ b/components/desktop/libotr/Makefile Tue Jan 19 08:40:43 2016 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,15 +50,17 @@
automake -a -c -f ; \
autoconf )
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
ASLR_MODE = $(ASLR_ENABLE)
-configure: $(CONFIGURE_32)
+configure: $(CONFIGURE_32_and_64)
-build: $(BUILD_32)
+build: $(BUILD_32_and_64)
-install: $(INSTALL_32)
+install: $(INSTALL_32_and_64)
test: $(NO_TESTS)
--- a/components/desktop/libotr/libotr.p5m Fri Jan 15 19:55:20 2016 -0800
+++ b/components/desktop/libotr/libotr.p5m Tue Jan 19 08:40:43 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -60,6 +60,10 @@
file path=usr/include/libotr/tlv.h
file path=usr/include/libotr/userstate.h
file path=usr/include/libotr/version.h
+link path=usr/lib/$(MACH64)/libotr.so target=libotr.so.5.1.0
+link path=usr/lib/$(MACH64)/libotr.so.5 target=libotr.so.5.1.0
+file path=usr/lib/$(MACH64)/libotr.so.5.1.0
+file path=usr/lib/$(MACH64)/pkgconfig/libotr.pc
link path=usr/lib/libotr.so target=libotr.so.5.1.0
link path=usr/lib/libotr.so.5 target=libotr.so.5.1.0
file path=usr/lib/libotr.so.5.1.0