10 files changed, 14 insertions, 16 deletions
diff --git a/cpp/managementgen/Makefile.am b/cpp/managementgen/Makefile.am
index 7a415b4be6..c8c1e64492 100644
--- a/cpp/managementgen/Makefile.am
+++ b/cpp/managementgen/Makefile.am
@@ -1,18 +1,16 @@
-qmfdatadir = $(datadir)/qmf
 qmfpythondir = $(pythondir)
 dist_bin_SCRIPTS = \
 	qmf-gen
-nobase_qmfdata_DATA = \
-	templates/Args.h \
-	templates/Class.cpp \
-	templates/Class.h \
-	templates/Makefile.mk \
-	templates/Package.cpp \
-	templates/Package.h \
-	management-types.xml
 nobase_qmfpython_DATA = \
 	qmf/__init__.py \
 	qmf/generate.py \
-	qmf/schema.py
+	qmf/schema.py \
+	qmf/templates/Args.h \
+	qmf/templates/Class.cpp \
+	qmf/templates/Class.h \
+	qmf/templates/Makefile.mk \
+	qmf/templates/Package.cpp \
+	qmf/templates/Package.h \
+	qmf/management-types.xml
 
-EXTRA_DIST = $(nobase_qmfdata_DATA) $(nobase_qmfpython_DATA)
+EXTRA_DIST = $(nobase_qmfpython_DATA)
diff --git a/cpp/managementgen/qmf-gen b/cpp/managementgen/qmf-gen
index a29a4074fd..840733bf7b 100755
--- a/cpp/managementgen/qmf-gen
+++ b/cpp/managementgen/qmf-gen
@@ -24,16 +24,16 @@ from qmf.schema   import PackageSchema, SchemaClass
 from qmf.generate import Generator
 from optparse     import OptionParser
 
-dataPath = os.path.dirname(sys.argv[0])
+dataPath = os.path.dirname(sys.argv[0]) + "/qmf/"
 
 # Set command line options
 usage  = "usage: %prog [options] schema-document out-directory"
 parser = OptionParser (usage=usage)
 parser.add_option ("-m", "--makefile", dest="makefile", metavar="FILE",
                    help="Makefile fragment")
-parser.add_option ("-t", "--typefile", dest="typefile", metavar="FILE", default=dataPath + "/management-types.xml",
+parser.add_option ("-t", "--typefile", dest="typefile", metavar="FILE", default=dataPath + "management-types.xml",
                    help="Type descriptor file")
-parser.add_option ("-d", "--templatedir", dest="templatedir", metavar="DIR", default=dataPath + "/templates",
+parser.add_option ("-d", "--templatedir", dest="templatedir", metavar="DIR", default=dataPath + "templates",
                    help="Template directory")
 
 (opts, args) = parser.parse_args ()
diff --git a/cpp/managementgen/qmf/generate.py b/cpp/managementgen/qmf/generate.py
index c1edf0b8e2..70735b208a 100755
--- a/cpp/managementgen/qmf/generate.py
+++ b/cpp/managementgen/qmf/generate.py
@@ -110,7 +110,7 @@ class Makefile:
     stream.write (mdir + "/qmf-gen \\\n")
     stream.write ("    " + mdir + "/qmf/generate.py \\\n")
     stream.write ("    " + mdir + "/qmf/schema.py \\\n")
-    stream.write ("    " + mdir + "/management-types.xml \\\n")
+    stream.write ("    " + mdir + "/qmf/management-types.xml \\\n")
     stream.write ("    " + sdir + "/management-schema.xml \\\n")
     first = True
     for template in self.templateFiles:
@@ -119,7 +119,7 @@ class Makefile:
         stream.write ("    ")
       else:
         stream.write (" \\\n    ")
-      stream.write (mdir + "/templates/" + template)
+      stream.write (mdir + "/qmf/templates/" + template)
 
   def genGenCppFiles (self, stream, variables):
     first = True
diff --git a/cpp/managementgen/management-types.xml b/cpp/managementgen/qmf/management-types.xml
index 31337b23bc..31337b23bc 100644
--- a/cpp/managementgen/management-types.xml
+++ b/cpp/managementgen/qmf/management-types.xml
diff --git a/cpp/managementgen/templates/Args.h b/cpp/managementgen/qmf/templates/Args.h
index 576d891a3f..576d891a3f 100644
--- a/cpp/managementgen/templates/Args.h
+++ b/cpp/managementgen/qmf/templates/Args.h
diff --git a/cpp/managementgen/templates/Class.cpp b/cpp/managementgen/qmf/templates/Class.cpp
index 2a0e55b34d..2a0e55b34d 100644
--- a/cpp/managementgen/templates/Class.cpp
+++ b/cpp/managementgen/qmf/templates/Class.cpp
diff --git a/cpp/managementgen/templates/Class.h b/cpp/managementgen/qmf/templates/Class.h
index 40ad20eb85..40ad20eb85 100644
--- a/cpp/managementgen/templates/Class.h
+++ b/cpp/managementgen/qmf/templates/Class.h
diff --git a/cpp/managementgen/templates/Makefile.mk b/cpp/managementgen/qmf/templates/Makefile.mk
index 0e6454c13a..0e6454c13a 100644
--- a/cpp/managementgen/templates/Makefile.mk
+++ b/cpp/managementgen/qmf/templates/Makefile.mk
diff --git a/cpp/managementgen/templates/Package.cpp b/cpp/managementgen/qmf/templates/Package.cpp
index 15e7fc15ec..15e7fc15ec 100644
--- a/cpp/managementgen/templates/Package.cpp
+++ b/cpp/managementgen/qmf/templates/Package.cpp
diff --git a/cpp/managementgen/templates/Package.h b/cpp/managementgen/qmf/templates/Package.h
index 3f3ac35ffc..3f3ac35ffc 100644
--- a/cpp/managementgen/templates/Package.h
+++ b/cpp/managementgen/qmf/templates/Package.h