Install the right version of libmmtk_julia

Author: udesou

Makefile

@@ -281,10 +281,6 @@ endif
 endif
 endif
 
-ifneq (${MMTK_PLAN},None)
-JL_PRIVATE_LIBS-0 += libmmtk_julia
-endif
-
 # Note that we disable MSYS2's path munging here, as otherwise
 # it replaces our `:`-separated list as a `;`-separated one.
 define stringreplace
@@ -379,6 +375,24 @@ endif
 	# Install `dsymutil` into private_libexecdir/
 	$(INSTALL_M) $(build_depsbindir)/dsymutil$(EXE) $(DESTDIR)$(private_libexecdir)/
 
+	ifneq (${MMTK_PLAN},None)
+	# Make sure we use the right version of $MMTK_PLAN, $MMTK_MOVING and $MMTK_BUILD
+	ifeq (${MMTK_PLAN},Immix)
+	LIB_PATH_PLAN = immix
+	else ifeq (${MMTK_PLAN},StickyImmix)
+	LIB_PATH_PLAN = sticky
+	endif
+
+	ifeq ($(MMTK_MOVING), 0)
+	LIB_PATH_MOVING := non_moving
+	else
+	LIB_PATH_MOVING := moving
+	endif
+
+	# Install `libmmtk_julia` into private_libdir/
+	$(INSTALL_M) $(build_libdir)/$(LIB_PATH_PLAN)/$(LIB_PATH_MOVING)/$(MMTK_BUILD)/libmmtk_julia.$(SHLIB_EXT) $(DESTDIR)$(private_libdir)
+	endif
+
 	# Copy public headers
 	cp -R -L $(build_includedir)/julia/* $(DESTDIR)$(includedir)/julia
 	# Copy system image