Merge pull request #10249 from bwbarrett/bugfix/make-dist-error-message

build: Run missing package dist-hook earlier

Author: bwbarrett

Makefile.am

@@ -12,7 +12,7 @@
 # Copyright (c) 2006-2022 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2015 Los Alamos National Security, Inc.  All rights reserved.
 # Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
-# Copyright (c) 2017-2021 Amazon.com, Inc. or its affiliates.
+# Copyright (c) 2017-2022 Amazon.com, Inc. or its affiliates.  All Rights reserved.
 #                         All Rights reserved.
 # Copyright (c) 2020      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
@@ -22,6 +22,9 @@
 # $HEADER$
 #
 
+# There is an assumption in config/Makefile.am that config is the first
+# subdirectory in the DIST_SUBDIRS list.  If that changes, work may
+# be required.
 SUBDIRS = config contrib 3rd-party $(MCA_PROJECT_SUBDIRS) test docs
 DIST_SUBDIRS = config contrib 3rd-party $(MCA_PROJECT_DIST_SUBDIRS) test docs
 EXTRA_DIST = README.md VERSION Doxyfile LICENSE autogen.pl AUTHORS
@@ -34,14 +37,6 @@ dist-hook:
 		echo "AUTHORS file is empty; aborting distribution"; \
 		exit 1; \
 	fi
-	@if test -n "$(OPAL_MAKEDIST_DISABLE)" ; then \
-		echo "#########################################################################"; \
-		echo "#"; \
-		echo "# make dist is disabled due to the following packages: $(OPAL_MAKEDIST_DISABLE)"; \
-		echo "#"; \
-		echo "#########################################################################"; \
-		exit 1; \
-	fi
 
 # Check for common symbols.  Use a "-hook" to increase the odds that a
 # developer will see it at the end of their installation process.

config/Makefile.am

@@ -15,13 +15,27 @@
 # Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
 # Copyright (c) 2016      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
 
+# This is a weird place for this, but config/ is the first directory that
+# is entered, and the dist-hook runs at the end of the current directory,
+# so this is the earliest we can run this test.
+dist-hook:
+	@if test -n "$(OPAL_MAKEDIST_DISABLE)" ; then \
+		echo "#########################################################################"; \
+		echo "#"; \
+		echo "# make dist is disabled due to the following packages: $(OPAL_MAKEDIST_DISABLE)"; \
+		echo "#"; \
+		echo "#########################################################################"; \
+		exit 1; \
+	fi
+
 EXTRA_DIST = \
         distscript.sh \
         opal_get_version.m4sh \