Merge pull request #322 from LLNL/rc2dev-mcm86-24may23-fix-pyprint-co…

…nfigure

Merge pull request #321 from LLNL/mcm86-24may23-fix-pyprint-configure

config-site/Makefile.am

@@ -53,7 +53,7 @@
 ## Procss this file with automake to create Makefile.in
 
 
-EXTRA_DIST = *.conf
+EXTRA_DIST = $(srcdir)/*.conf
 
 #
 # By default, the dist-gzip target (as well as other distribution
@@ -68,8 +68,17 @@ EXTRA_DIST = *.conf
 # code below is a based on code generated by Automake for the distdir
 # target, but modified to handle this case.
 #
+# Due to substantial differences in controlling cp behavior with links
+# between macOS and Linux, I added logic to disable attempts to produce
+# distributions from macOS. Distribution files should be produced only
+# from a Linux system.
+#
 dist-hook:
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	@if test -z "$(uname | grep -i linux)"; then \
+            echo -e "\n\n\n***Produce distributions only from linux***\n\n\n"; \
+            exit 1; \
+        fi; \
+        srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         list='$(DISTFILES)'; \
         dist_files=`for file in $$list; do echo $$file; done | \

config-site/Makefile.in

@@ -359,7 +359,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = *.conf
+EXTRA_DIST = $(srcdir)/*.conf
 all: all-am
 
 .SUFFIXES:
@@ -568,8 +568,17 @@ uninstall-am:
 # code below is a based on code generated by Automake for the distdir
 # target, but modified to handle this case.
 #
+# Due to substantial differences in controlling cp behavior with links
+# between macOS and Linux, I added logic to disable attempts to produce
+# distributions from macOS. Distribution files should be produced only
+# from a Linux system.
+#
 dist-hook:
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	@if test -z "$(uname | grep -i linux)"; then \
+            echo -e "\n\n\n***Produce distributions only from linux***\n\n\n"; \
+            exit 1; \
+        fi; \
+        srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         list='$(DISTFILES)'; \
         dist_files=`for file in $$list; do echo $$file; done | \

config/Makefile.in

@@ -198,7 +198,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
+	config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@

configure

@@ -27909,7 +27909,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
 $as_echo_n "checking for Python include path... " >&6; }
    if test -z "$PYTHON_CPPFLAGS"; then
       python_path=`$PYTHON -c "import distutils.sysconfig; \
-         print distutils.sysconfig.get_python_inc();"`
+         print(distutils.sysconfig.get_python_inc());"`
       if test -n "${python_path}"; then
          python_path="-I$python_path"
       fi

configure.ac

@@ -1148,7 +1148,7 @@ if test -n "$PYTHONMODULE"; then
    AC_MSG_CHECKING([for Python include path])
    if test -z "$PYTHON_CPPFLAGS"; then
       python_path=`$PYTHON -c "import distutils.sysconfig; \
-         print distutils.sysconfig.get_python_inc();"`
+         print(distutils.sysconfig.get_python_inc());"`
       if test -n "${python_path}"; then
          python_path="-I$python_path"
       fi