Merge commit 'origin/bug_138_networkwizard_fixes' into experimental

[enigma2.git] / lib / python / Plugins / newplugin.py

diff --git a/lib/python/Plugins/newplugin.py b/lib/python/Plugins/newplugin.py
index c84f0609dac80601a849ba5ab4e6a704f504ebcf..c1c6f948052e914fc21794acbbbd837b97622f71 100644 (file)
--- a/lib/python/Plugins/newplugin.py
+++ b/lib/python/Plugins/newplugin.py
@@ -101,8 +101,8 @@ for where in targetlist:
        importlist.append(where[0])
 
 file.write("""from Screens.Screen import Screen
-from Plugins.Plugin import PluginDescriptor, %s
-""" % ', '.join(importlist))
+from Plugins.Plugin import PluginDescriptor
+""")
 
 mainlist = []
 for count in range(len(targetlist)):
@@ -134,4 +134,13 @@ def Plugins(**kwargs):
        return %s
        """ % descriptorlist)
 
-file.close()
\ No newline at end of file
+file.close()
+
+makefile = open(pluginpath + "/Makefile.am", "w")
+makefile.write("""installdir = $(LIBDIR)/enigma2/python/Plugins/%s/%s
+
+install_PYTHON = \\
+       __init__.py \\
+       plugin.py
+""" % (category, internalname))
+makefile.close()