moved stuff, again

2025-01-23 01:40:08 +00:00 · 2007-02-08 00:31:18 +00:00 · 2007-02-08 00:31:18 +00:00 · a4202f6c35
commit a4202f6c35
parent ee60730dae
10 changed files with 5 additions and 3 deletions
--- a/src/glade/delugegtk.glade
+++ b/src/glade/delugegtk.glade
--- a/src/glade/dgtkpopups.glade
+++ b/src/glade/dgtkpopups.glade
--- a/src/glade/dgtkpref.glade
+++ b/src/glade/dgtkpref.glade
--- a/src/pixmaps/deluge128.png
+++ b/src/pixmaps/deluge128.png
--- a/src/pixmaps/deluge192.png
+++ b/src/pixmaps/deluge192.png
--- a/src/pixmaps/deluge22.png
+++ b/src/pixmaps/deluge22.png
--- a/src/pixmaps/deluge256.png
+++ b/src/pixmaps/deluge256.png
--- a/src/pixmaps/deluge32.png
+++ b/src/pixmaps/deluge32.png
--- a/setup.py
+++ b/setup.py
@ -88,7 +88,8 @@ setup(name="deluge", fullname="Deluge BitTorrent Client", version="0.5.0",
 	scripts=["scripts/deluge"],
 	packages=['deluge'],
 	package_dir = {'deluge': 'src'},
-	package_data={'deluge': ['glade/*.glade', 'pixmaps/*.png']},
+	data_files=[("share/deluge/glade", ["glade/delugegtk.glade", "glade/dgtkpopups.glade", "glade/dgtkpref.glade"]),
+                                ("share/deluge/pixmaps", ["pixmaps/deluge32.png","pixmaps/deluge128.png"])],
 	ext_package='deluge',
 	ext_modules=[deluge_core]
 	)
--- a/src/dcommon.py
+++ b/src/dcommon.py
@ -23,8 +23,9 @@ import sys, os, os.path, webbrowser
 PROGRAM_NAME = "Deluge"
 PROGRAM_VERSION = "0.4.9.0"
 DELUGE_DIR = os.path.abspath(os.path.dirname(sys.argv[0]))
-GLADE_DIR = DELUGE_DIR + "/glade"
-PIXMAP_DIR = DELUGE_DIR + "/pixmaps"
+PREFIX = sys.prefix
+GLADE_DIR = PREFIX + "/share/deluge/glade"
+PIXMAP_DIR = PREFIX + "/share/deluge/pixmaps"

 class DelugePreferences:
 	def __init__(self):