From 2dfee0a9f9cb7d77c547f6a6cd615996139fcd67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 30 Oct 2011 19:56:08 +0100
Subject: [PATCH] Move df2mc to devel

---
 .gitmodules                  | 4 ++--
 plugins/CMakeLists.txt       | 6 ------
 plugins/devel/CMakeLists.txt | 5 +++++
 plugins/devel/df2mc          | 1 +
 plugins/df2mc                | 1 -
 5 files changed, 8 insertions(+), 9 deletions(-)
 create mode 160000 plugins/devel/df2mc
 delete mode 160000 plugins/df2mc

diff --git a/.gitmodules b/.gitmodules
index 5fcc3ec0d..a5baa2316 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "plugins/stonesense"]
 	path = plugins/stonesense
 	url = git://github.com/peterix/stonesense.git
-[submodule "plugins/df2mc"]
-	path = plugins/df2mc
+[submodule "plugins/devel/df2mc"]
+	path = plugins/devel/df2mc
 	url = git://github.com/peterix/DF2MC.git
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 045943c1b..cd66e4156 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -20,12 +20,6 @@ if(BUILD_STONESENSE)
     add_subdirectory (stonesense)
 endif()
 
-OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." ON)
-if(BUILD_DF2MC)
-    add_subdirectory (df2mc)
-endif()
-
-
 OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
 if(BUILD_DEV_PLUGINS)
     add_subdirectory (devel)
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index 31c31a224..33750ab4f 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -9,3 +9,8 @@ DFHACK_PLUGIN(notes notes.cpp)
 DFHACK_PLUGIN(memview memview.cpp)
 DFHACK_PLUGIN(buildprobe buildprobe.cpp)
 #DFHACK_PLUGIN(tiles tiles.cpp)
+
+OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." ON)
+if(BUILD_DF2MC)
+    add_subdirectory (df2mc)
+endif()
diff --git a/plugins/devel/df2mc b/plugins/devel/df2mc
new file mode 160000
index 000000000..068787ba6
--- /dev/null
+++ b/plugins/devel/df2mc
@@ -0,0 +1 @@
+Subproject commit 068787ba6c71311639ca4806a3609fa800ba6588
diff --git a/plugins/df2mc b/plugins/df2mc
deleted file mode 160000
index f23b5c291..000000000
--- a/plugins/df2mc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f23b5c29119f0e3621da66ac621f1993948be555