--- a/components/desktop/libjpeg/Makefile	Wed Jul 13 19:42:05 2016 -0700
+++ b/components/desktop/libjpeg/Makefile	Thu Jul 14 10:32:27 2016 -0700
@@ -23,6 +23,7 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
+BUILD_BITS = 	64_and_32
 COMPILER =	gcc
 
 include ../../../make-rules/shared-macros.mk
@@ -41,33 +42,22 @@
 
 TPNO=			9298
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/common.mk
 
 LDFLAGS +=		$(CC_BITS)
 
-CONFIGURE_OPTIONS +=	--prefix=$(PROTO_DIR)/usr
+CONFIGURE_OPTIONS +=	--prefix=$(PROTOUSRDIR)
 CONFIGURE_OPTIONS +=	--enable-shared
-CONFIGURE_OPTIONS +=	LDFLAGS="$(LDFLAGS)"
+
+CONFIGURE_ENV += INSTALL="$(INSTALL) -D"
 
-COMPONENT_INSTALL_ARGS +=	INSTALL_DATA="ginstall -D"
-COMPONENT_INSTALL_ARGS +=	INSTALL_LIB="ginstall -D"
-COMPONENT_INSTALL_ARGS +=	INSTALL_PROGRAM="ginstall -D"
+# Prevent libtool from embedding runpath (via -R).
+COMPONENT_POST_CONFIGURE_ACTION += \
+	$(GSED) -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' $(@D)/libtool; \
+	$(GSED) -i -e 's/hardcode_libdir_flag_spec=.*/hardcode_libdir_flag_spec=""/' $(@D)/libtool;
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
 ASLR_MODE =	$(ASLR_ENABLE)
 
-configure:	$(CONFIGURE_32_and_64)
-
-build:          $(BUILD_32_and_64)
-
-install:        $(INSTALL_32_and_64)
-
-test:           $(TEST_32_and_64)
-
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library

--- a/components/desktop/libjpeg/libjpeg.p5m	Wed Jul 13 19:42:05 2016 -0700
+++ b/components/desktop/libjpeg/libjpeg.p5m	Thu Jul 14 10:32:27 2016 -0700
@@ -35,11 +35,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2003/085
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file $(MACH64)/cjpeg path=usr/bin/cjpeg
-file $(MACH64)/djpeg path=usr/bin/djpeg
-file $(MACH64)/jpegtran path=usr/bin/jpegtran
-file $(MACH64)/rdjpgcom path=usr/bin/rdjpgcom
-file $(MACH64)/wrjpgcom path=usr/bin/wrjpgcom
+file path=usr/bin/cjpeg
+file path=usr/bin/djpeg
+file path=usr/bin/jpegtran
+file path=usr/bin/rdjpgcom
+file path=usr/bin/wrjpgcom
 file path=usr/include/jconfig.h
 file path=usr/include/jerror.h
 file path=usr/include/jmorecfg.h