--- a/components/libusb/wrapper/Makefile	Tue Feb 21 09:04:08 2012 -0800
+++ b/components/libusb/wrapper/Makefile	Tue Feb 21 15:21:38 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -43,6 +43,9 @@
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) $@
 
+$(BUILD_DIR)/libusb-64.pc:	src/libusb-64.pc
+	/bin/sed -e "s#MACH64#$(MACH64)#g" <$< >$@
+
 download:
 
 clobber:	clean

--- a/components/libusb/wrapper/libusb.p5m	Tue Feb 21 09:04:08 2012 -0800
+++ b/components/libusb/wrapper/libusb.p5m	Tue Feb 21 15:21:38 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -38,6 +38,8 @@
 dir path=usr/include
 dir path=usr/lib
 dir path=usr/lib/$(MACH64)
+dir path=usr/lib/pkgconfig
+dir path=usr/lib/$(MACH64)/pkgconfig
 dir path=usr/share
 dir path=usr/share/doc
 dir path=usr/share/doc/libusb
@@ -47,6 +49,8 @@
 file $(MACH32)/libusb.txt path=usr/share/doc/libusb/libusb.txt
 file $(MACH32)/libusb.so.1 path=usr/lib/libusb.so.1
 file $(MACH64)/libusb.so.1 path=usr/lib/$(MACH64)/libusb.so.1
+file $(MACH32)/libusb.pc path=usr/lib/pkgconfig/libusb.pc
+file libusb-64.pc path=usr/lib/$(MACH64)/pkgconfig/libusb.pc
 
 link path=usr/lib/$(MACH64)/libusb.so target=libusb.so.1
 link path=usr/lib/libusb.so target=libusb.so.1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libusb/wrapper/src/libusb-64.pc	Tue Feb 21 15:21:38 2012 -0800
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/MACH64
+includedir=${prefix}/include
+
+Name: libusb
+Description: Sun wrapper library for libusb
+Version: 0.1.7
+Cflags: -I${includedir}
+Libs: -L${libdir} -lusb

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libusb/wrapper/src/libusb.pc	Tue Feb 21 15:21:38 2012 -0800
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libusb
+Description: Sun wrapper library for libusb
+Version: 0.1.7
+Cflags: -I${includedir}
+Libs: -L${libdir} -lusb