summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Banasiak <megabajt@pld-linux.org>2009-07-18 10:47:42 -0400
committerWillie Walker <william.walker@sun.com>2009-07-18 10:47:42 -0400
commit8775daf348426dd72a168b612d48a98626e1ebc8 (patch)
treeca0303e18828e8e21e54b87cd3f60f53c9e8f1bc
parentc355c4df2350a901de6dc0d1f53e94b429438c4a (diff)
Fix for bgo#554162 - Install colorblind applet to pyexecdir
-rw-r--r--colorblind/Makefile.am4
-rw-r--r--colorblind/keybinder/Makefile.am2
-rw-r--r--colorblind/osutils/Makefile.am2
-rw-r--r--colorblind/ui/Makefile.am2
4 files changed, 5 insertions, 5 deletions
diff --git a/colorblind/Makefile.am b/colorblind/Makefile.am
index 4598471..53b060c 100644
--- a/colorblind/Makefile.am
+++ b/colorblind/Makefile.am
@@ -1,12 +1,12 @@
SUBDIRS = ui osutils data keybinder
colorblind-applet: colorblind-applet.py
- sed -e "s|\@PYTHONDIR\@|$(pythondir)|" $< > $@
+ sed -e "s|\@PYTHONDIR\@|$(pyexecdir)|" $< > $@
colorblindbindir = $(libdir)/colorblind-applet
colorblindbin_SCRIPTS = colorblind-applet
-colorblinddir = $(pythondir)/colorblind
+colorblinddir = $(pyexecdir)/colorblind
colorblind_PYTHON = \
__init__.py \
diff --git a/colorblind/keybinder/Makefile.am b/colorblind/keybinder/Makefile.am
index a8c360c..4ca1114 100644
--- a/colorblind/keybinder/Makefile.am
+++ b/colorblind/keybinder/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(PYTHON_INCLUDES) $(CBAPPLET_CFLAGS)
-_keybinderdir = $(pythondir)/colorblind/keybinder
+_keybinderdir = $(pyexecdir)/colorblind/keybinder
_keybinder_LTLIBRARIES = _keybinder.la
_keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder
_keybinder_la_LIBADD = $(CBAPPLET_LIBS)
diff --git a/colorblind/osutils/Makefile.am b/colorblind/osutils/Makefile.am
index f8b5ad5..66f682a 100644
--- a/colorblind/osutils/Makefile.am
+++ b/colorblind/osutils/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(PYTHON_INCLUDES) $(CBAPPLET_CFLAGS)
-_osutilsdir = $(pythondir)/colorblind/osutils
+_osutilsdir = $(pyexecdir)/colorblind/osutils
_osutils_LTLIBRARIES = _osutils.la
_osutils_la_LDFLAGS = -module -avoid-version init_osutils
_osutils_la_LIBADD = $(CBAPPLET_LIBS)
diff --git a/colorblind/ui/Makefile.am b/colorblind/ui/Makefile.am
index 5bbf92f..7c62bbe 100644
--- a/colorblind/ui/Makefile.am
+++ b/colorblind/ui/Makefile.am
@@ -1,4 +1,4 @@
-colorblinddir = $(pythondir)/colorblind/ui
+colorblinddir = $(pyexecdir)/colorblind/ui
colorblind_PYTHON = \
About.py \
ColorblindPreferencesUI.py \