diff --git a/src/plugins/job_container/cray/Makefile.am b/src/plugins/job_container/cray/Makefile.am
index 56ad1eaef82b536618e9b5e044f9e734b8eb5ed6..4e22906932a66e41f33340b245cd907a4885813d 100644
--- a/src/plugins/job_container/cray/Makefile.am
+++ b/src/plugins/job_container/cray/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
 
 PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_JOB_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_CPPFLAGS)
 
 if HAVE_REAL_CRAY
 CRAY_JOB = job_container_cray.la
@@ -13,5 +13,4 @@ pkglib_LTLIBRARIES = $(CRAY_JOB)
 
 # job_container/cray plugin.
 job_container_cray_la_SOURCES = job_container_cray.c
-job_container_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
-job_container_cray_la_LIBADD  = $(CRAY_JOB_LIBS)
+job_container_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(CRAY_LDFLAGS)
diff --git a/src/plugins/job_container/cray/Makefile.in b/src/plugins/job_container/cray/Makefile.in
index 009e6b0aef0d90a27d9e8ff63fe4d8a101ed0e6f..3c01dd57988e475fccd1b19bc962486c1fe1e327 100644
--- a/src/plugins/job_container/cray/Makefile.in
+++ b/src/plugins/job_container/cray/Makefile.in
@@ -133,7 +133,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-job_container_cray_la_DEPENDENCIES =
+job_container_cray_la_LIBADD =
 am_job_container_cray_la_OBJECTS = job_container_cray.lo
 job_container_cray_la_OBJECTS = $(am_job_container_cray_la_OBJECTS)
 job_container_cray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -397,14 +397,13 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_JOB_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_CPPFLAGS)
 @HAVE_REAL_CRAY_TRUE@CRAY_JOB = job_container_cray.la
 pkglib_LTLIBRARIES = $(CRAY_JOB)
 
 # job_container/cray plugin.
 job_container_cray_la_SOURCES = job_container_cray.c
-job_container_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(CRAY_JOB_LDFLAGS)
-job_container_cray_la_LIBADD = $(CRAY_JOB_LIBS)
+job_container_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(CRAY_LDFLAGS)
 all: all-am
 
 .SUFFIXES: