jhbuild r2786 - trunk

[otaylor svn gnome org]

Author: otaylor
Date: Tue Apr  7 16:41:24 2009
New Revision: 2786
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2786&view=rev

Log:
2009-04-07  Owen Taylor  <otaylor redhat com>

        Bug 571240 â Search for 'install' binary at run time

        * install-check.c (main): Some systems (in particular Arch Linux)
        use put the install executable somewhere other than
        /usr/bin/install. So use execvp() rather than execv() to run the
        system install.


Modified:
   trunk/ChangeLog
   trunk/install-check.c

Modified: trunk/install-check.c
==============================================================================
--- trunk/install-check.c	(original)
+++ trunk/install-check.c	Tue Apr  7 16:41:24 2009
@@ -65,6 +65,7 @@
   char **args;
   int i, len;
   char *dot, *lastarg, *start;
+  int ret;
 
   lastarg = argv[argc - 1];
 
@@ -109,7 +110,7 @@
   args = malloc (sizeof (char *) * (argc + 1));
 
 #ifndef WITH_INSTALL
-  args[0] = "/usr/bin/install";
+  args[0] = "install";
 #else
   args[0] = WITH_INSTALL;
 #endif
@@ -119,5 +120,8 @@
 
   args[argc] = NULL;
 
-  return execv (args[0], args);
+  ret = execvp (args[0], args);
+  perror("executing 'install' failed");
+
+  return 1;
 }