Kill BINDIR.

When executing para_client or para_audioc from para_mixer or para_gui
we currently pass an absolute path whose directory part is BINDIR
to execvp(2). This is unnecessary because execvp(2) honors $PATH.
This commit modifies gui.c and mixer.c to pass only the basename of
the executable instead, allowing us to remove the BINDIR preprocessor
define. We still need the bindir make variable, though, because it
is referenced in the recipe of the two install targets.

diff --git a/Makefile.real b/Makefile.real
index 19f4c232a6d84163ab1fd689d51285c124d44d19..a5492d6632eb39727e6b1d2d6bb25c9281a7dc95 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -357,7 +357,6 @@ $(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir) \
        $(yy_build_dir):
        @$(MKDIR_P) $@
 
-CPPFLAGS += -DBINDIR='"$(bindir)"'
 CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DLOGLEVELS='$(LOGLEVELS)'

diff --git a/gui.c b/gui.c
index 2ad8ae46202f98dc545bd4115561d8d317f4b486..feb65c0f8883372326525dc13531cbceeef4d50f 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1027,9 +1027,7 @@ fail:
 
 static void exec_para(const char *args)
 {
-       char *file_and_args;
-
-       file_and_args = make_message(BINDIR "/para_client -- %s", args);
+       char *file_and_args = make_message("para_client -- %s", args);
        exec_and_display(file_and_args);
        free(file_and_args);
 }

diff --git a/mixer.c b/mixer.c
index dda7fc1df729722266db7136733a28ac2391e977..787a72574242e46dd09552bce5534e826a3288ba 100644 (file)
--- a/mixer.c
+++ b/mixer.c
@@ -217,12 +217,12 @@ fail:
 
 static void client_cmd(const char *cmd)
 {
-       run(BINDIR "/para_client", cmd);
+       run("para_client", cmd);
 }
 
 static void audioc_cmd(const char *cmd)
 {
-       run(BINDIR "/para_audioc", cmd);
+       run("para_audioc", cmd);
 }
 
 static void change_afs_mode(const char *afs_mode)