[master] Merge of 2956, missed module rename in spec file.

diff --git a/src/bin/d2/d2_controller.cc b/src/bin/d2/d2_controller.cc
index d5b34940dea1ac725cc41a23859cf35415795e61..0200b644d7c59e0b55d4bdaf79fc4b277bee318f 100644 (file)
--- a/src/bin/d2/d2_controller.cc
+++ b/src/bin/d2/d2_controller.cc
@@ -45,7 +45,7 @@ D2Controller::D2Controller()
     // use the production value.
     if (getenv("B10_FROM_BUILD")) {
         setSpecFileName(std::string(getenv("B10_FROM_BUILD")) +
-            "/src/bin/d2/d2.spec");
+            "/src/bin/d2/dhcp-ddns.spec");
     } else {
         setSpecFileName(D2_SPECFILE_LOCATION);
     }

diff --git a/src/bin/d2/dhcp-ddns.spec b/src/bin/d2/dhcp-ddns.spec
index c594f2b0651e543ca1ff1b5267beeebdf36bc904..1098adaa7cd8f4ba16d1dea460145d831394d616 100644 (file)
--- a/src/bin/d2/dhcp-ddns.spec
+++ b/src/bin/d2/dhcp-ddns.spec
@@ -1,6 +1,6 @@
 {
   "module_spec": {
-    "module_name": "D2",
+    "module_name": "DhcpDdns",
     "module_description": "DHPC-DDNS Service",
     "config_data": [
     ],

diff --git a/src/bin/d2/spec_config.h.pre.in b/src/bin/d2/spec_config.h.pre.in
index e45a69a4462993b68324f60f9737e573bd584e5b..6d48a7eeea318bef9705ad8a187962053ebaa9c0 100644 (file)
--- a/src/bin/d2/spec_config.h.pre.in
+++ b/src/bin/d2/spec_config.h.pre.in
@@ -12,4 +12,4 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#define D2_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/d2.spec"
+#define D2_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/dhcp-ddns.spec"