[epiphany] Move ephy-profile-migrator to pkglibexecdir



commit 79b44b52728f256d23f5e3b0df95cb84f2d331a7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 15:11:32 2016 -0500

    Move ephy-profile-migrator to pkglibexecdir
    
    It's not intended to be run by users, so it shouldn't be installed to
    bindir.

 lib/Makefile.am          |   17 +++++++++--------
 lib/ephy-profile-utils.c |    2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9584aee..ae3b871 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -69,13 +69,14 @@ nodist_libephymisc_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libephymisc_la_CPPFLAGS = \
-       -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
-       -DDATADIR=\"$(datadir)\"                    \
-       -DLOCALEDIR=\"$(localedir)\"                \
-       -DSHARE_DIR=\"$(pkgdatadir)\"               \
-       -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"    \
-       -I$(top_builddir)/lib                       \
-       -I$(top_srcdir)/lib/egg                     \
+       -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\"     \
+       -DDATADIR=\"$(datadir)\"                        \
+       -DLOCALEDIR=\"$(localedir)\"                    \
+       -DPKGLIBEXECDIR=\"$(pkglibexecdir)\"            \
+       -DSHARE_DIR=\"$(pkgdatadir)\"                   \
+       -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
+       -I$(top_builddir)/lib                           \
+       -I$(top_srcdir)/lib/egg                         \
        $(AM_CPPFLAGS)
 
 libephymisc_la_CFLAGS = \
@@ -111,7 +112,7 @@ libephymisc_la_LIBADD = \
        $(SQLITE3_LIBS)         \
        $(WEBKIT2GTK_LIBS)
 
-bin_PROGRAMS = ephy-profile-migrator
+pkglibexec_PROGRAMS = ephy-profile-migrator
 
 ephy_profile_migrator_SOURCES = \
        ephy-profile-migrator.c
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index b5dbb08..e86ec92 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -93,7 +93,7 @@ ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run,
   GError *error = NULL;
   char *index = NULL, *version = NULL;
   int status;
-  const char *argv[6] = { EPHY_PROFILE_MIGRATOR, "-v" };
+  const char *argv[6] = { PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR, "-v" };
   int i = 2; /* index for argv, start filling at 2. */
   char **envp;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]