diff -r 3781477accf3 -r 20c0f21bbe1e components/python/django-appconf/Makefile --- a/components/python/django-appconf/Makefile Thu Mar 19 14:35:58 2015 -0700 +++ b/components/python/django-appconf/Makefile Thu Mar 19 20:44:31 2015 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on django, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -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) @@ -51,6 +51,4 @@ # unittests require django-discover-runner which is not integrated test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk