--- a/Makefile Wed Apr 29 10:53:49 2015 -0700
+++ b/Makefile Mon May 04 17:37:29 2015 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation
#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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"),
@@ -43,6 +43,7 @@
MK_OPTS = open-src/common/Makefile.options
setup: $(MK_OPTS)
+.INIT: setup
$(MK_OPTS):
@ if [[ -n "${X_BUILD_OPTIONS}" ]] ; then \
--- a/open-src/common/Makefile.init Wed Apr 29 10:53:49 2015 -0700
+++ b/open-src/common/Makefile.init Mon May 04 17:37:29 2015 -0700
@@ -52,6 +52,9 @@
# sets the Makefile.options link to point to a included Makefile to
# set these up.
+$(TOP)/open-src/common/Makefile.options:
+ cd $(TOP) ; $(MAKE) $(MAKEFLAGS) setup
+
include "Makefile.options"
### Machine architecture macros
--- a/open-src/util/util-macros/Makefile Wed Apr 29 10:53:49 2015 -0700
+++ b/open-src/util/util-macros/Makefile Mon May 04 17:37:29 2015 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -61,7 +61,7 @@
$(SOURCE_DIR)/configure.ac
# autoreconf fails if the aclocal include directories don't exist yet
-$(AUTOCONF_TARGET): $(PROTODIR)$(X11_ACLOCAL_DIR)
+$(PATCHED_TARGET) $(AUTOCONF_TARGET): $(PROTODIR)$(X11_ACLOCAL_DIR)
$(PROTODIR)$(X11_ACLOCAL_DIR):
mkdir -p $@
--- a/pkg/Makefile Wed Apr 29 10:53:49 2015 -0700
+++ b/pkg/Makefile Mon May 04 17:37:29 2015 -0700
@@ -520,3 +520,7 @@
fix_perms:
@print "## Fixing proto area permissions"
$(PKGDEBUG)find $(FIX_PERMS_IN:%=$(PKGROOT)%) -type f -exec chmod a-w \{\} \+
+
+# Nothing to do for "make source", but avoid error when run at top-level
+source:
+ @true