diff -r 60344306d223 -r 30b42c38bbc4 components/python/passlib/Makefile --- a/components/python/passlib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/passlib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk