install images into DATADIR "/enigma2" and set PYTHONPATH if unset

diff --git a/data/Makefile.am b/data/Makefile.am
index 05dcebb406d9c4a51f84f284bac72b9df564325b..6f698424ce9db5fee2d7ea911c44559a5f5712cd 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = gnu
 installdir = $(DATADIR)/enigma2
 
 install_DATA = \
-       skin.xml menu.xml setup.xml keymap.xml
+       *.xml *.png

diff --git a/main/enigma.cpp b/main/enigma.cpp
index e669b19b49165e61a61b71b162ced24d8de3ced5..d53955abb5c0a2be22656d91916e2c5fbca5ae86 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -151,6 +151,10 @@ int main(int argc, char **argv)
        atexit(object_dump);
 #endif
 
+       // set pythonpath if unset
+       setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+       printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
        ePython python;
        eMain main;
@@ -189,10 +193,10 @@ int main(int argc, char **argv)
        dsk_lcd.setDC(my_lcd_dc);
 
        ePtr<gPixmap> m_pm;
-       loadPNG(m_pm, "data/pal.png");
+       loadPNG(m_pm, DATADIR "/enigma2/pal.png");
        if (!m_pm)
        {
-               eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+               eFatal("pal.png not found!");
        } else
                dsk.setPalette(*m_pm);