--- a/open-src/common/Makefile.inc	Wed Apr 20 09:49:44 2016 -0700
+++ b/open-src/common/Makefile.inc	Wed Apr 20 14:06:18 2016 -0700
@@ -369,11 +369,11 @@
 # First, make warnings about missing files into fatal errors
 FIX_PC_OPS  = $(PERL_MISSING_FILES_ERROR)
 # Remove -L flags for libraries in the default library path (/usr/lib{/64})
-FIX_PC_OPS += -e 's|-L\$${libdir}|| if "$(MODULE_ADD_LIB_SUBDIR)" eq "";'
+FIX_PC_OPS += -e 's|-L\$$\{libdir}|| if "$(MODULE_ADD_LIB_SUBDIR)" eq "";'
 # Add -R flags for libraries in non-default library paths
-FIX_PC_OPS += -e 's|-L\$${libdir}|-L\$${libdir} -R\$${libdir}|;'
+FIX_PC_OPS += -e 's|-L\$$\{libdir}|-L\$$\{libdir} -R\$$\{libdir}|;'
 # Remove duplicate -R flags if upstream already provided one
-FIX_PC_OPS += -e 's|-R\$${libdir}( .*)? -R\$${libdir}|-R\$${libdir}$$1|g;'
+FIX_PC_OPS += -e 's|-R\$$\{libdir}( .*)? -R\$$\{libdir}|-R\$$\{libdir}$$1|g;'
 # Allow modules to add their own operations
 FIX_PC_OPS += $(MODTYPE_FIX_PC_FLAGS) $(MODULE_FIX_PC_FLAGS)
 
@@ -545,7 +545,7 @@
 # Prepend $protodir to paths for includes, libraries to link against, etc.
 UNINSTALLED_PC_OPS += -e 's|(-[LI]\s*)\$$|$$1$$protodir\$$|g;'
 UNINSTALLED_PC_OPS += -e 's|^sdkdir=|sdkdir=$$protodir|g;'
-UNINSTALLED_PC_OPS += -e 's|$$protodir\$${sdkdir}|\$${sdkdir}|g;'
+UNINSTALLED_PC_OPS += -e 's|$$protodir\$$\{sdkdir}|\$$\{sdkdir}|g;'
 # Allow modules to add their own operations
 UNINSTALLED_PC_OPS += $(MODTYPE_ADD_UNINSTALLED_PC_OPS)
 UNINSTALLED_PC_OPS += $(MODULE_ADD_UNINSTALLED_PC_OPS)

--- a/open-src/common/Makefile.init	Wed Apr 20 09:49:44 2016 -0700
+++ b/open-src/common/Makefile.init	Wed Apr 20 14:06:18 2016 -0700
@@ -389,7 +389,7 @@
 ## Perl tools & paths
 # When changing PERL_VERSION, check that PERL_PKG_VERSION is
 # still set correctly in pkg/Makefile
-PERL_VERSION = 5.20
+PERL_VERSION = 5.22
 PERL = /usr/perl5/$(PERL_VERSION)/bin/perl
 # perl -p/-n commands treat missing files as warnings, not fatal errors
 # Adding the following raises them to errors so that make detects a problem

--- a/open-src/common/set-elf-comments.pl	Wed Apr 20 09:49:44 2016 -0700
+++ b/open-src/common/set-elf-comments.pl	Wed Apr 20 14:06:18 2016 -0700
@@ -1,4 +1,4 @@
-#! /usr/perl5/5.20/bin/perl
+#! /usr/perl5/5.22/bin/perl
 #
 # Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
 #