diff -r d8b9f5323d55 -r e4614bd11218 open-src/common/Makefile.init --- a/open-src/common/Makefile.init Wed Feb 25 13:39:12 2015 -0800 +++ b/open-src/common/Makefile.init Tue Mar 03 07:18:15 2015 -0800 @@ -1,7 +1,7 @@ # -*- Makefile -*- rules commonly shared among X consolidation open source dirs # Makefile.init has definitions that are needed before the module/modtype rules # -# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -331,7 +331,7 @@ ## Python tools & paths # When changing PYTHON_VERSION, check that PYTHON_PKG_VERSION & # PYTHON_PATH_VERSION are still set correctly in pkg/Makefile -PYTHON_VERSION=2.6 +PYTHON_VERSION=2.7 PYTHON=/usr/bin/python$(PYTHON_VERSION) PYTHON_PATH=$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages:$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/site-packages:/usr/lib/python$(PYTHON_VERSION)/vendor-packages:/usr/lib/python$(PYTHON_VERSION)/site-packages # We want our python modules installed to vendor-packages, not site-packages