From 45175c193f968a093da12f6327eb82b22a0ff50d Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 3 Oct 2005 17:34:32 +0000
Subject: [PATCH] install images into DATADIR "/enigma2" and set PYTHONPATH if
 unset

---
 data/Makefile.am | 2 +-
 main/enigma.cpp  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 05dcebb4..6f698424 100644
--- 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 e669b19b..d53955ab 100644
--- 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);
 
-- 
2.30.2