[Xfce4-commits] <xfce-utils:master> Move xfconf migration script to $libdir (bug #6917).

[Nick Schermer]

Updating branch refs/heads/master
         to 7bdc7a72f68b00a0d74e3ef02aecdd67b22d6a81 (commit)
       from f8bd586a0be03f691d5b00d8be3fb9ddad5f116c (commit)

commit 7bdc7a72f68b00a0d74e3ef02aecdd67b22d6a81
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 5 01:06:48 2010 +0100

    Move xfconf migration script to $libdir (bug #6917).

 scripts/Makefile.am                     |    4 ++--
 scripts/xfconf-migration-4.6.desktop.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2ea17e4..54b6b8f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -49,7 +49,7 @@ conffiles_DATA=\
 
 if XFCONF_MIGRATION
 
-migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration
+migrationscriptdir = $(libdir)/xfce4/xfconf-migration
 migrationscript_in_files = xfconf-migration-4.6.pl.in
 migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl)
 
@@ -61,7 +61,7 @@ autostart_in_files = xfconf-migration-4.6.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 xfconf-migration-4.6.desktop: $(srcdir)/xfconf-migration-4.6.desktop.in
-	sed 's,\@libexecdir\@,$(libexecdir),' < $< > $@
+	sed 's,\@libdir\@,$(libdir),' < $< > $@
 
 endif
 
diff --git a/scripts/xfconf-migration-4.6.desktop.in b/scripts/xfconf-migration-4.6.desktop.in
index f31795c..56f658f 100644
--- a/scripts/xfconf-migration-4.6.desktop.in
+++ b/scripts/xfconf-migration-4.6.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Xfconf Migration Script
-Exec=@libexecdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+Exec=@libdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl
 Terminal=false
 Type=Application
 StartupNotify=false