From 72b5e45b58a08d9d527af2d14be23097be36f7f2 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 9 Jul 2014 16:51:06 -0700
Subject: [PATCH] more cleanup for the contribs/cray dir
---
contribs/cray/Makefile.am | 6 +++++-
contribs/cray/Makefile.in | 7 ++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/contribs/cray/Makefile.am b/contribs/cray/Makefile.am
index e92e4a760d2..3262483bdac 100644
--- a/contribs/cray/Makefile.am
+++ b/contribs/cray/Makefile.am
@@ -16,8 +16,9 @@ if HAVE_NATIVE_CRAY
sbin_SCRIPTS = slurmconfgen.py
endif
+if HAVE_REAL_CRAY
noinst_DATA = opt_modulefiles_slurm
-
+endif
# Don't rely on autoconf to replace variables outside of makefiles
opt_modulefiles_slurm: opt_modulefiles_slurm.in Makefile
@@ -29,3 +30,6 @@ opt_modulefiles_slurm: opt_modulefiles_slurm.in Makefile
slurmconfgen.py: slurmconfgen.py.in Makefile
sed -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
${abs_srcdir}/slurmconfgen.py.in >slurmconfgen.py
+
+clean-generic:
+ rm -f opt_modulefiles_slurm slurmconfgen.py
diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
index 43894d9e62c..0e8541ccd5f 100644
--- a/contribs/cray/Makefile.in
+++ b/contribs/cray/Makefile.in
@@ -430,7 +430,7 @@ EXTRA_DIST = \
slurmconfgen.py.in
@HAVE_NATIVE_CRAY_TRUE@sbin_SCRIPTS = slurmconfgen.py
-noinst_DATA = opt_modulefiles_slurm
+@HAVE_REAL_CRAY_TRUE@noinst_DATA = opt_modulefiles_slurm
all: all-am
.SUFFIXES:
@@ -570,8 +570,6 @@ install-strip:
fi
mostlyclean-generic:
-clean-generic:
-
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
@@ -671,6 +669,9 @@ slurmconfgen.py: slurmconfgen.py.in Makefile
sed -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
${abs_srcdir}/slurmconfgen.py.in >slurmconfgen.py
+clean-generic:
+ rm -f opt_modulefiles_slurm slurmconfgen.py
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
GitLab