diff -r 87edc8451f8a -r 2a3c61e80af0 jdk/make/launcher/Launcher-jdk.policytool.gmk
--- a/jdk/make/launcher/Launcher-jdk.policytool.gmk	Fri Sep 23 13:24:33 2016 -0700
+++ b/jdk/make/launcher/Launcher-jdk.policytool.gmk	Mon Sep 26 14:56:35 2016 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 include LauncherCommon.gmk
 
-ifndef BUILD_HEADLESS_ONLY
+ifeq ($(ENABLE_HEADLESS_ONLY), false)
   $(eval $(call SetupBuildLauncher, policytool, \
       MAIN_CLASS := sun.security.tools.policytool.PolicyTool, \
       LIBS_unix := $(X_LIBS), \