automake bug workaround for configfiles

ovis-hpc · Apr 23, 2015 · a237194 · a237194
1 parent d7e19a7
commit a237194
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/ldms/configure.ac b/ldms/configure.ac
@@ -404,6 +404,7 @@ for i in $ovis_exec_scripts; do
 done
 ],[
 	ovis_exec_scripts="$ovis_exec_scripts"
+	ovis_extra_dist="$ovis_extra_dist"
 	ovis_exec_scripts_objdir="$ac_pwd"
 ])
 AC_OUTPUT

diff --git a/ldms/scripts/Makefile.am b/ldms/scripts/Makefile.am
@@ -1,5 +1,6 @@
 
 # consider adding ldmsd to bin_SCRIPTS if ldmsd script ever stabilizes
+EXTRA_DIST=@OVIS_EXTRA_DIST@
 bin_SCRIPTS= envldms.sh \
 	ldms_local_clocktest.sh \
 	ldms_local_usertest.sh \

diff --git a/m4/options.m4 b/m4/options.m4
@@ -337,9 +337,19 @@ AC_DEFINE_UNQUOTED([LDMS_CONFIG_ARGS],["$ac_configure_args"],[configure input])
 
 AC_DEFUN([OVIS_EXEC_SCRIPTS], [
 	ovis_exec_scripts=""
-	for i in "$@"; do
+	for i in "$*"; do
+		x="$i ";
+	done
+	for i in $x; do
 		ovis_exec_scripts="$ovis_exec_scripts $i"
+		x=`basename $i`
+		if ! test "x$x" = "x"; then
+			ovis_extra_dist="$ovis_extra_dist ${x}.in"
+		else
+			echo cannot parse $i
+		fi
 		AC_CONFIG_FILES([$i],[chmod a+x $i])
 	done
+	AC_SUBST([OVIS_EXTRA_DIST],[$ovis_extra_dist])
 ])