There was a problem when building from source where for example

@bindir@ would resolve to ${prefix}/bin.

This patch fixes it, based on http://www.gnu.org/software/autoconf/manual/
autoconf-2.69/html_node/Installation-Directory-Variables.html

It also changes opt_modulefiles_slurm to opt_modulefiles_slurm.in but
I couldn't figure out how to get git diff to show that.

configure.ac

@@ -414,8 +414,6 @@ AC_CONFIG_FILES([Makefile
 		 auxdir/Makefile
 		 contribs/Makefile
 		 contribs/cray/Makefile
-		 contribs/cray/opt_modulefiles_slurm
-		 contribs/cray/slurmconfgen.py
 		 contribs/lua/Makefile
 		 contribs/mic/Makefile
 		 contribs/pam/Makefile

contribs/cray/Makefile.am

@@ -7,12 +7,27 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = \
 	etc_sysconfig_slurm		\
 	libalps_test_programs.tar.gz	\
-	opt_modulefiles_slurm		\
-	pam_job.c
+	opt_modulefiles_slurm.in	\
+	pam_job.c 			\
+	slurm.conf.template		\
+	slurmconfgen.py.in
 
 if HAVE_NATIVE_CRAY
 sbin_SCRIPTS = slurmconfgen.py
-sysconf_DATA = slurm.conf.template
-else
-EXTRA_DIST += slurmconfgen.py slurm.conf.template
+noinst_DATA = opt_modulefiles_slurm
 endif
+
+if HAVE_CRAY_NETWORK
+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
+	sed -e 's|@prefix[@]|$(prefix)|g' \
+	    -e 's|@MUNGE_DIR[@]|$(MUNGE_DIR)|g' \
+	    -e 's|@libdir[@]|$(libdir)|g' \
+	    opt_modulefiles_slurm.in >opt_modulefiles_slurm
+
+slurmconfgen.py: slurmconfgen.py.in Makefile
+	sed -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	    slurmconfgen.py.in >slurmconfgen.py