[orca] Fix for bug 703472 - Fix Makefiles so orca can be a noarch package

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] Fix for bug 703472 - Fix Makefiles so orca can be a noarch package
Date: Wed, 11 Sep 2013 12:07:59 +0000 (UTC)
commit 38ee6dcf7ce6b20260c6498b31d31e74d7246680
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Sep 10 19:46:46 2013 -0400

    Fix for bug 703472 - Fix Makefiles so orca can be a noarch package

 src/orca/Makefile.am                               |    4 +---
 src/orca/backends/Makefile.am                      |    4 +---
 src/orca/scripts/Makefile.am                       |    4 +---
 src/orca/scripts/apps/Banshee/Makefile.am          |    4 +---
 src/orca/scripts/apps/Eclipse/Makefile.am          |    4 +---
 src/orca/scripts/apps/Instantbird/Makefile.am      |    4 +---
 src/orca/scripts/apps/Makefile.am                  |    4 +---
 src/orca/scripts/apps/Mozilla/Makefile.am          |    4 +---
 src/orca/scripts/apps/Thunderbird/Makefile.am      |    4 +---
 src/orca/scripts/apps/ddu/Makefile.am              |    4 +---
 src/orca/scripts/apps/ekiga/Makefile.am            |    4 +---
 src/orca/scripts/apps/empathy/Makefile.am          |    4 +---
 src/orca/scripts/apps/evince/Makefile.am           |    4 +---
 src/orca/scripts/apps/evolution/Makefile.am        |    4 +---
 src/orca/scripts/apps/gajim/Makefile.am            |    4 +---
 src/orca/scripts/apps/gcalctool/Makefile.am        |    4 +---
 .../scripts/apps/gdm-simple-greeter/Makefile.am    |    4 +---
 src/orca/scripts/apps/gdmlogin/Makefile.am         |    4 +---
 src/orca/scripts/apps/gedit/Makefile.am            |    4 +---
 src/orca/scripts/apps/gnome-documents/Makefile.am  |    4 +---
 .../scripts/apps/gnome-keyring-ask/Makefile.am     |    4 +---
 src/orca/scripts/apps/gnome-mud/Makefile.am        |    4 +---
 src/orca/scripts/apps/gnome-panel/Makefile.am      |    4 +---
 .../apps/gnome-screensaver-dialog/Makefile.am      |    4 +---
 .../scripts/apps/gnome-search-tool/Makefile.am     |    4 +---
 .../scripts/apps/gnome-system-monitor/Makefile.am  |    4 +---
 src/orca/scripts/apps/gnome-terminal/Makefile.am   |    4 +---
 .../apps/gnome-window-properties/Makefile.am       |    4 +---
 src/orca/scripts/apps/gnome_segv2/Makefile.am      |    4 +---
 .../scripts/apps/gtk-window-decorator/Makefile.am  |    4 +---
 src/orca/scripts/apps/liferea/Makefile.am          |    4 +---
 src/orca/scripts/apps/metacity/Makefile.am         |    4 +---
 src/orca/scripts/apps/nautilus/Makefile.am         |    4 +---
 .../scripts/apps/notification-daemon/Makefile.am   |    4 +---
 src/orca/scripts/apps/notify-osd/Makefile.am       |    4 +---
 src/orca/scripts/apps/packagemanager/Makefile.am   |    4 +---
 src/orca/scripts/apps/pidgin/Makefile.am           |    4 +---
 src/orca/scripts/apps/planner/Makefile.am          |    4 +---
 src/orca/scripts/apps/rhythmbox/Makefile.am        |    4 +---
 src/orca/scripts/apps/soffice/Makefile.am          |    4 +---
 src/orca/scripts/apps/xfwm4/Makefile.am            |    4 +---
 src/orca/scripts/toolkits/CALLY/Makefile.am        |    4 +---
 src/orca/scripts/toolkits/Gecko/Makefile.am        |    4 +---
 .../toolkits/J2SE-access-bridge/Makefile.am        |    4 +---
 src/orca/scripts/toolkits/Makefile.am              |    4 +---
 src/orca/scripts/toolkits/WebKitGtk/Makefile.am    |    4 +---
 46 files changed, 46 insertions(+), 138 deletions(-)
---
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index e68eecf..b9e497f 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -5,8 +5,6 @@ orcadir=$(bindir)
 uidir=$(datadir)/orca/ui
 gfxdir=$(datadir)/orca/gfx
 
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        acss.py \
@@ -72,7 +70,7 @@ orca_python_PYTHON = \
        tutorialgenerator.py \
        where_am_I.py
 
-orca_pythondir=$(pyexecdir)/orca
+orca_pythondir=$(pkgpythondir)
 
 SUBDIRS = \
         scripts \
diff --git a/src/orca/backends/Makefile.am b/src/orca/backends/Makefile.am
index 0aefe99..894c2d9 100644
--- a/src/orca/backends/Makefile.am
+++ b/src/orca/backends/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
         __init__.py \
         json_backend.py
 
-orca_pythondir=$(pyexecdir)/orca/backends
+orca_pythondir=$(pkgpythondir)/backends
 
diff --git a/src/orca/scripts/Makefile.am b/src/orca/scripts/Makefile.am
index e01c6bd..49b289a 100644
--- a/src/orca/scripts/Makefile.am
+++ b/src/orca/scripts/Makefile.am
@@ -1,11 +1,9 @@
 SUBDIRS = apps toolkits
 
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        default.py \
        self_voicing.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts
+orca_pythondir=$(pkgpythondir)/scripts
 
diff --git a/src/orca/scripts/apps/Banshee/Makefile.am b/src/orca/scripts/apps/Banshee/Makefile.am
index fa90363..58cc782 100644
--- a/src/orca/scripts/apps/Banshee/Makefile.am
+++ b/src/orca/scripts/apps/Banshee/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
@@ -7,4 +5,4 @@ orca_python_PYTHON = \
        speech_generator.py \
        formatting.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/Banshee
+orca_pythondir=$(pkgpythondir)/scripts/apps/Banshee
diff --git a/src/orca/scripts/apps/Eclipse/Makefile.am b/src/orca/scripts/apps/Eclipse/Makefile.am
index 86d449c..e849129 100644
--- a/src/orca/scripts/apps/Eclipse/Makefile.am
+++ b/src/orca/scripts/apps/Eclipse/Makefile.am
@@ -1,9 +1,7 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        script_utilities.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/Eclipse
+orca_pythondir=$(pkgpythondir)/scripts/apps/Eclipse
 
diff --git a/src/orca/scripts/apps/Instantbird/Makefile.am b/src/orca/scripts/apps/Instantbird/Makefile.am
index 9d7ae5e..845b71b 100644
--- a/src/orca/scripts/apps/Instantbird/Makefile.am
+++ b/src/orca/scripts/apps/Instantbird/Makefile.am
@@ -1,10 +1,8 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        chat.py \
        script.py \
        script_utilities.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/Instantbird
+orca_pythondir=$(pkgpythondir)/scripts/apps/Instantbird
 
diff --git a/src/orca/scripts/apps/Makefile.am b/src/orca/scripts/apps/Makefile.am
index 77e5472..8b47d81 100644
--- a/src/orca/scripts/apps/Makefile.am
+++ b/src/orca/scripts/apps/Makefile.am
@@ -37,10 +37,8 @@ SUBDIRS = \
        Thunderbird \
        xfwm4
 
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps
+orca_pythondir=$(pkgpythondir)/scripts/apps
 
diff --git a/src/orca/scripts/apps/Mozilla/Makefile.am b/src/orca/scripts/apps/Mozilla/Makefile.am
index cab8c6a..d24f5f2 100644
--- a/src/orca/scripts/apps/Mozilla/Makefile.am
+++ b/src/orca/scripts/apps/Mozilla/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/Mozilla
+orca_pythondir=$(pkgpythondir)/scripts/apps/Mozilla
diff --git a/src/orca/scripts/apps/Thunderbird/Makefile.am b/src/orca/scripts/apps/Thunderbird/Makefile.am
index df484e3..db1d54d 100644
--- a/src/orca/scripts/apps/Thunderbird/Makefile.am
+++ b/src/orca/scripts/apps/Thunderbird/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        formatting.py \
@@ -8,5 +6,5 @@ orca_python_PYTHON = \
        script_utilities.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/Thunderbird
+orca_pythondir=$(pkgpythondir)/scripts/apps/Thunderbird
 
diff --git a/src/orca/scripts/apps/ddu/Makefile.am b/src/orca/scripts/apps/ddu/Makefile.am
index d21f79f..8727b90 100644
--- a/src/orca/scripts/apps/ddu/Makefile.am
+++ b/src/orca/scripts/apps/ddu/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        script_utilities.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/ddu
+orca_pythondir=$(pkgpythondir)/scripts/apps/ddu
diff --git a/src/orca/scripts/apps/ekiga/Makefile.am b/src/orca/scripts/apps/ekiga/Makefile.am
index 26d0241..509f9e2 100644
--- a/src/orca/scripts/apps/ekiga/Makefile.am
+++ b/src/orca/scripts/apps/ekiga/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/ekiga
+orca_pythondir=$(pkgpythondir)/scripts/apps/ekiga
diff --git a/src/orca/scripts/apps/empathy/Makefile.am b/src/orca/scripts/apps/empathy/Makefile.am
index 5891ea0..2521e7a 100644
--- a/src/orca/scripts/apps/empathy/Makefile.am
+++ b/src/orca/scripts/apps/empathy/Makefile.am
@@ -1,9 +1,7 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        script_utilities.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/empathy
+orca_pythondir=$(pkgpythondir)/scripts/apps/empathy
 
diff --git a/src/orca/scripts/apps/evince/Makefile.am b/src/orca/scripts/apps/evince/Makefile.am
index 0959766..4f2bb21 100644
--- a/src/orca/scripts/apps/evince/Makefile.am
+++ b/src/orca/scripts/apps/evince/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        script_utilities.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/evince
+orca_pythondir=$(pkgpythondir)/scripts/apps/evince
diff --git a/src/orca/scripts/apps/evolution/Makefile.am b/src/orca/scripts/apps/evolution/Makefile.am
index c257d57..a2f3c7c 100644
--- a/src/orca/scripts/apps/evolution/Makefile.am
+++ b/src/orca/scripts/apps/evolution/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
     __init__.py \
     formatting.py \
@@ -7,5 +5,5 @@ orca_python_PYTHON = \
     script_utilities.py \
     speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/evolution
+orca_pythondir=$(pkgpythondir)/scripts/apps/evolution
 
diff --git a/src/orca/scripts/apps/gajim/Makefile.am b/src/orca/scripts/apps/gajim/Makefile.am
index aec9669..63515d1 100644
--- a/src/orca/scripts/apps/gajim/Makefile.am
+++ b/src/orca/scripts/apps/gajim/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gajim
+orca_pythondir=$(pkgpythondir)/scripts/apps/gajim
 
diff --git a/src/orca/scripts/apps/gcalctool/Makefile.am b/src/orca/scripts/apps/gcalctool/Makefile.am
index 02dbea3..9f783f4 100644
--- a/src/orca/scripts/apps/gcalctool/Makefile.am
+++ b/src/orca/scripts/apps/gcalctool/Makefile.am
@@ -1,9 +1,7 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gcalctool
+orca_pythondir=$(pkgpythondir)/scripts/apps/gcalctool
 
diff --git a/src/orca/scripts/apps/gdm-simple-greeter/Makefile.am 
b/src/orca/scripts/apps/gdm-simple-greeter/Makefile.am
index 6e1587f..829caf1 100644
--- a/src/orca/scripts/apps/gdm-simple-greeter/Makefile.am
+++ b/src/orca/scripts/apps/gdm-simple-greeter/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gdm-simple-greeter
+orca_pythondir=$(pkgpythondir)/scripts/apps/gdm-simple-greeter
diff --git a/src/orca/scripts/apps/gdmlogin/Makefile.am b/src/orca/scripts/apps/gdmlogin/Makefile.am
index 4e23731..b64367c 100644
--- a/src/orca/scripts/apps/gdmlogin/Makefile.am
+++ b/src/orca/scripts/apps/gdmlogin/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gdmlogin
+orca_pythondir=$(pkgpythondir)/scripts/apps/gdmlogin
diff --git a/src/orca/scripts/apps/gedit/Makefile.am b/src/orca/scripts/apps/gedit/Makefile.am
index 6a15454..2076568 100644
--- a/src/orca/scripts/apps/gedit/Makefile.am
+++ b/src/orca/scripts/apps/gedit/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gedit
+orca_pythondir=$(pkgpythondir)/scripts/apps/gedit
 
diff --git a/src/orca/scripts/apps/gnome-documents/Makefile.am 
b/src/orca/scripts/apps/gnome-documents/Makefile.am
index fa16aa9..b5e788d 100644
--- a/src/orca/scripts/apps/gnome-documents/Makefile.am
+++ b/src/orca/scripts/apps/gnome-documents/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-documents
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-documents
diff --git a/src/orca/scripts/apps/gnome-keyring-ask/Makefile.am 
b/src/orca/scripts/apps/gnome-keyring-ask/Makefile.am
index ea201a3..49582c7 100644
--- a/src/orca/scripts/apps/gnome-keyring-ask/Makefile.am
+++ b/src/orca/scripts/apps/gnome-keyring-ask/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-keyring-ask
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-keyring-ask
diff --git a/src/orca/scripts/apps/gnome-mud/Makefile.am b/src/orca/scripts/apps/gnome-mud/Makefile.am
index d23efd3..e7aff5b 100644
--- a/src/orca/scripts/apps/gnome-mud/Makefile.am
+++ b/src/orca/scripts/apps/gnome-mud/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-mud
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-mud
diff --git a/src/orca/scripts/apps/gnome-panel/Makefile.am b/src/orca/scripts/apps/gnome-panel/Makefile.am
index 6fb175c..5b5d44e 100644
--- a/src/orca/scripts/apps/gnome-panel/Makefile.am
+++ b/src/orca/scripts/apps/gnome-panel/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-panel
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-panel
diff --git a/src/orca/scripts/apps/gnome-screensaver-dialog/Makefile.am 
b/src/orca/scripts/apps/gnome-screensaver-dialog/Makefile.am
index 7ad0ca1..9721fc3 100644
--- a/src/orca/scripts/apps/gnome-screensaver-dialog/Makefile.am
+++ b/src/orca/scripts/apps/gnome-screensaver-dialog/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-screensaver-dialog
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-screensaver-dialog
diff --git a/src/orca/scripts/apps/gnome-search-tool/Makefile.am 
b/src/orca/scripts/apps/gnome-search-tool/Makefile.am
index 4bba17c..8968c76 100644
--- a/src/orca/scripts/apps/gnome-search-tool/Makefile.am
+++ b/src/orca/scripts/apps/gnome-search-tool/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-search-tool
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-search-tool
diff --git a/src/orca/scripts/apps/gnome-system-monitor/Makefile.am 
b/src/orca/scripts/apps/gnome-system-monitor/Makefile.am
index 371db11..384fd14 100644
--- a/src/orca/scripts/apps/gnome-system-monitor/Makefile.am
+++ b/src/orca/scripts/apps/gnome-system-monitor/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-system-monitor
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-system-monitor
diff --git a/src/orca/scripts/apps/gnome-terminal/Makefile.am 
b/src/orca/scripts/apps/gnome-terminal/Makefile.am
index bac79e0..09a5646 100644
--- a/src/orca/scripts/apps/gnome-terminal/Makefile.am
+++ b/src/orca/scripts/apps/gnome-terminal/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-terminal
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-terminal
diff --git a/src/orca/scripts/apps/gnome-window-properties/Makefile.am 
b/src/orca/scripts/apps/gnome-window-properties/Makefile.am
index 1e8a46c..3540e52 100644
--- a/src/orca/scripts/apps/gnome-window-properties/Makefile.am
+++ b/src/orca/scripts/apps/gnome-window-properties/Makefile.am
@@ -1,10 +1,8 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
     __init__.py \
     formatting.py \
     script.py
 
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome-window-properties
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome-window-properties
 
diff --git a/src/orca/scripts/apps/gnome_segv2/Makefile.am b/src/orca/scripts/apps/gnome_segv2/Makefile.am
index e7b3551..77deb61 100644
--- a/src/orca/scripts/apps/gnome_segv2/Makefile.am
+++ b/src/orca/scripts/apps/gnome_segv2/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gnome_segv2
+orca_pythondir=$(pkgpythondir)/scripts/apps/gnome_segv2
diff --git a/src/orca/scripts/apps/gtk-window-decorator/Makefile.am 
b/src/orca/scripts/apps/gtk-window-decorator/Makefile.am
index 3be676b..667824c 100644
--- a/src/orca/scripts/apps/gtk-window-decorator/Makefile.am
+++ b/src/orca/scripts/apps/gtk-window-decorator/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/gtk-window-decorator
+orca_pythondir=$(pkgpythondir)/scripts/apps/gtk-window-decorator
diff --git a/src/orca/scripts/apps/liferea/Makefile.am b/src/orca/scripts/apps/liferea/Makefile.am
index 0abd3b7..9a5f7d0 100644
--- a/src/orca/scripts/apps/liferea/Makefile.am
+++ b/src/orca/scripts/apps/liferea/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/liferea
+orca_pythondir=$(pkgpythondir)/scripts/apps/liferea
diff --git a/src/orca/scripts/apps/metacity/Makefile.am b/src/orca/scripts/apps/metacity/Makefile.am
index 30359b0..a56c472 100644
--- a/src/orca/scripts/apps/metacity/Makefile.am
+++ b/src/orca/scripts/apps/metacity/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/metacity
+orca_pythondir=$(pkgpythondir)/scripts/apps/metacity
diff --git a/src/orca/scripts/apps/nautilus/Makefile.am b/src/orca/scripts/apps/nautilus/Makefile.am
index ae36c55..511e760 100644
--- a/src/orca/scripts/apps/nautilus/Makefile.am
+++ b/src/orca/scripts/apps/nautilus/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/nautilus
+orca_pythondir=$(pkgpythondir)/scripts/apps/nautilus
diff --git a/src/orca/scripts/apps/notification-daemon/Makefile.am 
b/src/orca/scripts/apps/notification-daemon/Makefile.am
index 8ba196c..74f67ac 100644
--- a/src/orca/scripts/apps/notification-daemon/Makefile.am
+++ b/src/orca/scripts/apps/notification-daemon/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/notification-daemon
+orca_pythondir=$(pkgpythondir)/scripts/apps/notification-daemon
diff --git a/src/orca/scripts/apps/notify-osd/Makefile.am b/src/orca/scripts/apps/notify-osd/Makefile.am
index 9205626..ba0a435 100644
--- a/src/orca/scripts/apps/notify-osd/Makefile.am
+++ b/src/orca/scripts/apps/notify-osd/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/notify-osd
+orca_pythondir=$(pkgpythondir)/scripts/apps/notify-osd
diff --git a/src/orca/scripts/apps/packagemanager/Makefile.am 
b/src/orca/scripts/apps/packagemanager/Makefile.am
index 286a824..236196c 100644
--- a/src/orca/scripts/apps/packagemanager/Makefile.am
+++ b/src/orca/scripts/apps/packagemanager/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        braille_generator.py \
@@ -9,4 +7,4 @@ orca_python_PYTHON = \
        speech_generator.py \
        tutorialgenerator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/packagemanager
\ No newline at end of file
+orca_pythondir=$(pkgpythondir)/scripts/apps/packagemanager
\ No newline at end of file
diff --git a/src/orca/scripts/apps/pidgin/Makefile.am b/src/orca/scripts/apps/pidgin/Makefile.am
index 9df9c24..6f04197 100644
--- a/src/orca/scripts/apps/pidgin/Makefile.am
+++ b/src/orca/scripts/apps/pidgin/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        chat.py \
@@ -7,5 +5,5 @@ orca_python_PYTHON = \
        script_utilities.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/pidgin
+orca_pythondir=$(pkgpythondir)/scripts/apps/pidgin
 
diff --git a/src/orca/scripts/apps/planner/Makefile.am b/src/orca/scripts/apps/planner/Makefile.am
index a9365cd..cd80df5 100644
--- a/src/orca/scripts/apps/planner/Makefile.am
+++ b/src/orca/scripts/apps/planner/Makefile.am
@@ -1,10 +1,8 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
     __init__.py \
     braille_generator.py \
     script.py \
     speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/planner
+orca_pythondir=$(pkgpythondir)/scripts/apps/planner
 
diff --git a/src/orca/scripts/apps/rhythmbox/Makefile.am b/src/orca/scripts/apps/rhythmbox/Makefile.am
index 9bbca3e..5196692 100644
--- a/src/orca/scripts/apps/rhythmbox/Makefile.am
+++ b/src/orca/scripts/apps/rhythmbox/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        braille_generator.py \
@@ -7,5 +5,5 @@ orca_python_PYTHON = \
        script.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/rhythmbox
+orca_pythondir=$(pkgpythondir)/scripts/apps/rhythmbox
 
diff --git a/src/orca/scripts/apps/soffice/Makefile.am b/src/orca/scripts/apps/soffice/Makefile.am
index cb4c40a..1a84cdc 100644
--- a/src/orca/scripts/apps/soffice/Makefile.am
+++ b/src/orca/scripts/apps/soffice/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        braille_generator.py \
@@ -10,5 +8,5 @@ orca_python_PYTHON = \
        speech_generator.py \
        structural_navigation.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/soffice
+orca_pythondir=$(pkgpythondir)/scripts/apps/soffice
 
diff --git a/src/orca/scripts/apps/xfwm4/Makefile.am b/src/orca/scripts/apps/xfwm4/Makefile.am
index 6a40700..7df978c 100644
--- a/src/orca/scripts/apps/xfwm4/Makefile.am
+++ b/src/orca/scripts/apps/xfwm4/Makefile.am
@@ -1,7 +1,5 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/apps/xfwm4
+orca_pythondir=$(pkgpythondir)/scripts/apps/xfwm4
diff --git a/src/orca/scripts/toolkits/CALLY/Makefile.am b/src/orca/scripts/toolkits/CALLY/Makefile.am
index b939a86..997257e 100644
--- a/src/orca/scripts/toolkits/CALLY/Makefile.am
+++ b/src/orca/scripts/toolkits/CALLY/Makefile.am
@@ -1,8 +1,6 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        script.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/toolkits/CALLY
+orca_pythondir=$(pkgpythondir)/scripts/toolkits/CALLY
 
diff --git a/src/orca/scripts/toolkits/Gecko/Makefile.am b/src/orca/scripts/toolkits/Gecko/Makefile.am
index 98f6877..cee60b8 100644
--- a/src/orca/scripts/toolkits/Gecko/Makefile.am
+++ b/src/orca/scripts/toolkits/Gecko/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        bookmarks.py \
@@ -12,5 +10,5 @@ orca_python_PYTHON = \
        speech_generator.py \
        structural_navigation.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/toolkits/Gecko
+orca_pythondir=$(pkgpythondir)/scripts/toolkits/Gecko
 
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am 
b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
index 36bccf1..5b28f7d 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        formatting.py \
@@ -7,5 +5,5 @@ orca_python_PYTHON = \
        script_utilities.py \
        speech_generator.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/toolkits/J2SE-access-bridge
+orca_pythondir=$(pkgpythondir)/scripts/toolkits/J2SE-access-bridge
 
diff --git a/src/orca/scripts/toolkits/Makefile.am b/src/orca/scripts/toolkits/Makefile.am
index 5d30819..d2f46dc 100644
--- a/src/orca/scripts/toolkits/Makefile.am
+++ b/src/orca/scripts/toolkits/Makefile.am
@@ -1,11 +1,9 @@
 SUBDIRS = Gecko J2SE-access-bridge CALLY WebKitGtk
 
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        GAIL.py \
        VCL.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/toolkits
+orca_pythondir=$(pkgpythondir)/scripts/toolkits
 
diff --git a/src/orca/scripts/toolkits/WebKitGtk/Makefile.am b/src/orca/scripts/toolkits/WebKitGtk/Makefile.am
index d589e53..c542eb8 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/Makefile.am
+++ b/src/orca/scripts/toolkits/WebKitGtk/Makefile.am
@@ -1,5 +1,3 @@
-orca_pathdir=$(pyexecdir)
-
 orca_python_PYTHON = \
        __init__.py \
        braille_generator.py \
@@ -9,4 +7,4 @@ orca_python_PYTHON = \
        script_utilities.py \
        structural_navigation.py
 
-orca_pythondir=$(pyexecdir)/orca/scripts/toolkits/WebKitGtk
\ No newline at end of file
+orca_pythondir=$(pkgpythondir)/scripts/toolkits/WebKitGtk
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]