Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Screens / Makefile.am

diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index cde2d6c3e14c34a27e3e9c1d4b0e99f269d0b925..44994b86d0a5aab8c8d50b7364254459e02fb1ec 100755 (executable)
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Screens
+installdir = $(pkglibdir)/python/Screens

 
 install_PYTHON = \
        ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py    \
 
 install_PYTHON = \
        ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py    \


@@ -9,10 +9,10 @@ install_PYTHON = \
        InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
        Dish.py LanguageSelection.py StartWizard.py PiPSetup.py Subtitles.py \
        TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \
        InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
        Dish.py LanguageSelection.py StartWizard.py PiPSetup.py Subtitles.py \
        TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \

-       Console.py InputBox.py ChoiceBox.py SimpleSummary.py ImageWizard.py \
+       Console.py InputBox.py ChoiceBox.py SimpleSummary.py \

        TimerSelection.py PictureInPicture.py TimeDateInput.py \
        SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
        SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
        SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
        TimerSelection.py PictureInPicture.py TimeDateInput.py \
        SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
        SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
        SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \

-       TextBox.py
+       TextBox.py FactoryReset.py