Blame remove-mpark.patch

David Schwörer 86b481
diff --git a/make.config.in b/make.config.in
David Schwörer 86b481
index df80ed2ad..a1e75fdc0 100644
David Schwörer 86b481
--- a/make.config.in
David Schwörer 86b481
+++ b/make.config.in
David Schwörer 86b481
@@ -88,8 +88,7 @@ LIB    = $(BOUT_LIB_PATH)/libbout++.a
David Schwörer 86b481
 LIB_SO = $(BOUT_LIB_PATH)/libbout++.so
David Schwörer 86b481
 endif
David Schwörer 86b481
 
David Schwörer 86b481
-MPARK_VARIANT_INCLUDE_PATH=@MPARK_VARIANT_INCLUDE_PATH@
David Schwörer 86b481
-BOUT_INCLUDE = -I$(BOUT_INCLUDE_PATH) $(CXXINCLUDE) $(EXTRA_INCS) -I$(MPARK_VARIANT_INCLUDE_PATH)
David Schwörer 86b481
+BOUT_INCLUDE = -I$(BOUT_INCLUDE_PATH) $(CXXINCLUDE) $(EXTRA_INCS)
David Schwörer 86b481
 BOUT_LIBS    = -lm -L$(BOUT_LIB_PATH) -lbout++ $(EXTRA_LIBS)
David Schwörer 86b481
 
David Schwörer 86b481
 CHANGED = $(shell find -f $(BOUT_TOP)/include $(BOUT_TOP)/src -type f \( -name \*.cxx -or -name \*.h \) -newer $(LIB) -print 2> /dev/null)
David Schwörer 86b481
@@ -162,11 +161,10 @@ install: libfast
David Schwörer 86b481
 	$(PRE_INSTALL)     # Pre-install commands follow.
David Schwörer 86b481
 
David Schwörer 86b481
 	$(NORMAL_INSTALL)  # Normal commands follow.
David Schwörer 86b481
-	$(MKDIR) $(INSTALL_INCLUDE_PATH)/{,pvode,bout/sys,bout/invert,mpark}
David Schwörer 86b481
+	$(MKDIR) $(INSTALL_INCLUDE_PATH)/{,pvode,bout/sys,bout/invert}
David Schwörer 86b481
 	$(MKDIR) $(DESTDIR)/{@libdir@,@bindir@,@datadir@/bout++/idllib}
David Schwörer 86b481
 	$(MKDIR) $(DESTDIR)/@datadir@/bout++/pylib/{boutdata,boututils}
David Schwörer 86b481
 	$(INSTALL_DATA) include/*.hxx $(INSTALL_INCLUDE_PATH)
David Schwörer 86b481
-	$(INSTALL_DATA) $(MPARK_VARIANT_INCLUDE_PATH)/mpark/*.hpp $(INSTALL_INCLUDE_PATH)/mpark
David Schwörer 86b481
 	$(INSTALL_DATA) include/pvode/*.h $(INSTALL_INCLUDE_PATH)/pvode/
David Schwörer 86b481
 	$(INSTALL_DATA) include/bout/*.hxx $(INSTALL_INCLUDE_PATH)/bout/
David Schwörer 86b481
 	$(INSTALL_DATA) include/bout/sys/*.hxx $(INSTALL_INCLUDE_PATH)/bout/sys/
David Schwörer 86b481
@@ -190,13 +188,11 @@ install: libfast
David Schwörer 86b481
 	sed -i "s|^BOUT_CONFIG_FILE=.*|BOUT_CONFIG_FILE=@datadir@/bout++/make.config|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481
 	sed -i "s|^idlpath=.*|idlpath=@datadir@/bout++/idllib/|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481
 	sed -i "s|^pythonpath=.*|pythonpath=@datadir@/bout++/pylib/|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481
-	sed -i "s|^MPARK_VARIANT_INCLUDE_PATH=.*|MPARK_VARIANT_INCLUDE_PATH=@includedir@/bout++|" $(DESTDIR)@bindir@/bout-config
David Schwörer 86b481
 
David Schwörer 86b481
 	@# Modify paths in the make.config file
David Schwörer 86b481
 	sed -i "s|^BOUT_INCLUDE_PATH=.*|BOUT_INCLUDE_PATH=@includedir@/bout++|" $(DESTDIR)@datadir@/bout++/make.config
David Schwörer 86b481
 	sed -i "s|^BOUT_LIB_PATH=.*|BOUT_LIB_PATH=@libdir@|" $(DESTDIR)@datadir@/bout++/make.config
David Schwörer 86b481
 	sed -i "s|^BOUT_CONFIG_FILE=.*|BOUT_CONFIG_FILE=@datadir@/bout++/make.config|" $(DESTDIR)@datadir@/bout++/make.config
David Schwörer 86b481
-	sed -i "s|^MPARK_VARIANT_INCLUDE_PATH=.*|MPARK_VARIANT_INCLUDE_PATH=@includedir@/bout++|" $(DESTDIR)@datadir@/bout++/make.config
David Schwörer 86b481
 
David Schwörer 86b481
 uninstall:
David Schwörer 86b481
 	$(PRE_UNINSTALL)     # Pre-uninstall commands follow.
David Schwörer 86b481
@@ -220,13 +216,7 @@ uninstall:
David Schwörer 86b481
 # Builds the library with $(OBJ) which is defined from the SOURCEC variable
David Schwörer 86b481
 ####################################################################
David Schwörer 86b481
 
David Schwörer 86b481
-MPARK_VARIANT_SENTINEL = $(MPARK_VARIANT_INCLUDE_PATH)/mpark/variant.hpp
David Schwörer 86b481
-$(MPARK_VARIANT_SENTINEL):
David Schwörer 86b481
-	@echo "Downloading mpark.variant"
David Schwörer 86b481
-	git submodule update --init --recursive $(BOUT_TOP)/externalpackages/mpark.variant
David Schwörer 86b481
-
David Schwörer 86b481
 ifeq ("$(TARGET)", "libfast")
David Schwörer 86b481
-libfast: | $(MPARK_VARIANT_SENTINEL)
David Schwörer 86b481
 libfast: makefile $(BOUT_CONFIG_FILE) $(BOUT_TOP)/include $(OBJ) $(DIRS)
David Schwörer 86b481
 endif
David Schwörer 86b481