Attachment 305308 Details for Bug 446305 – proposed patch

[patch] proposed patch

allow_installs_to_other_prefixes.diff (text/plain), 5.80 KB, created by Rui Matos on 2008-05-14 00:09:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rui Matos

Created: 2008-05-14 00:09:17 UTC

Size: 5.80 KB

patch

obsolete

>diff --git a/acinclude.m4 b/acinclude.m4
>new file mode 100644
>index 0000000..0c71173
>--- /dev/null
>+++ b/acinclude.m4
>@@ -0,0 +1,40 @@
>+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
>+dnl
>+dnl example
>+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
>+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
>+
>+AC_DEFUN([AS_AC_EXPAND],
>+[
>+  EXP_VAR=[$1]
>+  FROM_VAR=[$2]
>+
>+  dnl first expand prefix and exec_prefix if necessary
>+  prefix_save=$prefix
>+  exec_prefix_save=$exec_prefix
>+
>+  dnl if no prefix given, then use /usr/local, the default prefix
>+  if test "x$prefix" = "xNONE"; then
>+    prefix=$ac_default_prefix
>+  fi
>+  dnl if no exec_prefix given, then use prefix
>+  if test "x$exec_prefix" = "xNONE"; then
>+    exec_prefix=$prefix
>+  fi
>+
>+  full_var="$FROM_VAR"
>+  dnl loop until it doesn't change anymore
>+  while true; do
>+    new_full_var="`eval echo $full_var`"
>+    if test "x$new_full_var"="x$full_var"; then break; fi
>+    full_var=$new_full_var
>+  done
>+
>+  dnl clean up
>+  full_var=$new_full_var
>+  AC_SUBST([$1], "$full_var")
>+
>+  dnl restore prefix and exec_prefix
>+  prefix=$prefix_save
>+  exec_prefix=$exec_prefix_save
>+])
>diff --git a/aclocal.m4 b/aclocal.m4
>index 5046a5d..cd888fd 100644
>--- a/aclocal.m4
>+++ b/aclocal.m4
>@@ -3076,3 +3076,4 @@ AC_SUBST([am__tar])
> AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
> 
>+m4_include([acinclude.m4])
>diff --git a/config.py.in b/config.py.in
>index 9b5b0d9..6c9fd8e 100644
>--- a/config.py.in
>+++ b/config.py.in
>@@ -1,2 +1,3 @@
>+DATA_DIR="@DATADIR@"
> VERSION="@VERSION@"
>-DOWNLOADABLE_DRIVER_SUPPORT=False
>\ No newline at end of file
>+DOWNLOADABLE_DRIVER_SUPPORT=False
>diff --git a/configure.in b/configure.in
>index 3597f41..ae8a032 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -14,9 +14,16 @@ AC_SUBST(GETTEXT_PACKAGE)
> AC_SUBST(CATOBJEXT)
> AC_SUBST(DATADIRNAME)
> ALL_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu hi hr hu hy id is it ja ka kn ko lo lv mk ml mr ms my nb nl nn or pa pl pt_BR pt ro ru si sk sl sr@latin sr sv ta te tr uk vi zh_CN zh_TW"
>+
>+AS_AC_EXPAND(DATADIR, $datarootdir)
>+AC_SUBST(DATADIR)
>+
> AC_CONFIG_FILES([
> Makefile
> po/Makefile.in
> config.py
>+my-default-printer
>+system-config-printer
>+system-config-printer-applet
> ])
> AC_OUTPUT
>diff --git a/manage-print-jobs.desktop.in b/manage-print-jobs.desktop.in
>index a6750e9..6774e6c 100644
>--- a/manage-print-jobs.desktop.in
>+++ b/manage-print-jobs.desktop.in
>@@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Manage Print Jobs
> _Comment=Cancel, pause, resume or reprint jobs
>-Exec=/usr/bin/system-config-printer-applet --no-tray-icon
>+Exec=system-config-printer-applet --no-tray-icon
> Terminal=false
> Type=Application
> Icon=printer
>diff --git a/my-default-printer b/my-default-printer
>deleted file mode 100755
>index 1bf7912..0000000
>--- a/my-default-printer
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/sh
>-exec /usr/share/system-config-printer/my-default-printer.py "$@"
>diff --git a/my-default-printer.desktop.in b/my-default-printer.desktop.in
>index e763d5e..e002ae7 100644
>--- a/my-default-printer.desktop.in
>+++ b/my-default-printer.desktop.in
>@@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Default Printer
> _Comment=Select default printer
>-Exec=/usr/bin/my-default-printer
>+Exec=my-default-printer
> Terminal=false
> Type=Application
> Icon=printer
>diff --git a/my-default-printer.in b/my-default-printer.in
>new file mode 100644
>index 0000000..7fa772d
>--- /dev/null
>+++ b/my-default-printer.in
>@@ -0,0 +1,3 @@
>+#!/bin/sh
>+prefix=@prefix@
>+exec @datarootdir@/@PACKAGE@/my-default-printer.py "$@"
>diff --git a/print-applet.desktop.in b/print-applet.desktop.in
>index 540cb17..0439a1c 100644
>--- a/print-applet.desktop.in
>+++ b/print-applet.desktop.in
>@@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Print Queue Applet
> _Comment=System tray icon for managing print jobs
>-Exec=/usr/bin/system-config-printer-applet
>+Exec=system-config-printer-applet
> Terminal=false
> Type=Application
> Icon=printer
>diff --git a/system-config-printer b/system-config-printer
>deleted file mode 100755
>index af9e794..0000000
>--- a/system-config-printer
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/sh
>-exec /usr/share/system-config-printer/system-config-printer.py "$@"
>diff --git a/system-config-printer-applet b/system-config-printer-applet
>deleted file mode 100755
>index 82eb2f7..0000000
>--- a/system-config-printer-applet
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/sh
>-exec /usr/share/system-config-printer/applet.py "$@"
>diff --git a/system-config-printer-applet.in b/system-config-printer-applet.in
>new file mode 100644
>index 0000000..22b5f75
>--- /dev/null
>+++ b/system-config-printer-applet.in
>@@ -0,0 +1,3 @@
>+#!/bin/sh
>+prefix=@prefix@
>+exec @datarootdir@/@PACKAGE@/applet.py "$@"
>diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in
>index 00a1cc5..9816920 100644
>--- a/system-config-printer.desktop.in
>+++ b/system-config-printer.desktop.in
>@@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Printing
> _Comment=Configure printers
>-Exec=/usr/bin/system-config-printer
>+Exec=system-config-printer
> Terminal=false
> Type=Application
> Icon=printer
>diff --git a/system-config-printer.in b/system-config-printer.in
>new file mode 100644
>index 0000000..c4ea13d
>--- /dev/null
>+++ b/system-config-printer.in
>@@ -0,0 +1,3 @@
>+#!/bin/sh
>+prefix=@prefix@
>+exec @datarootdir@/@PACKAGE@/system-config-printer.py "$@"
>diff --git a/system-config-printer.py b/system-config-printer.py
>index 5ec270e..5a61651 100755
>--- a/system-config-printer.py
>+++ b/system-config-printer.py
>@@ -81,9 +81,9 @@ from gettext import gettext as _
> import gettext
> gettext.textdomain (domain)
> gtk.glade.bindtextdomain (domain)
>-pkgdata = '/usr/share/' + domain
>-iconpath = pkgdata + '/icons/'
>-glade_file = pkgdata + '/' + domain + '.glade'
>+pkgdata = os.path.join (config.DATA_DIR, domain)
>+iconpath = os.path.join (pkgdata, '/icons/')
>+glade_file = os.path.join (pkgdata, domain + '.glade')
> sys.path.append (pkgdata)
> 
> busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)

Actions: View | Diff

Attachments on bug 446305: 305308