makefile fixes for prrte binary prefixing

There were changes to PRRTE after UofL merged

uofl-capstone-open-mpi#9

into their fork of prrte.  These changes get it working again.

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

src/rml/oob/Makefile.am

@@ -32,7 +32,7 @@ headers += \
       rml/oob/oob_tcp_hdr.h \
       rml/oob/oob_tcp_peer.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
       rml/oob/oob_tcp_component.c \
       rml/oob/oob_tcp.c \
       rml/oob/oob_tcp_listener.c \

src/runtime/data_server/Makefile.am

@@ -26,7 +26,7 @@ headers += \
         runtime/data_server/prte_data_server.h \
         runtime/data_server/ds.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         runtime/data_server/ds_main.c \
         runtime/data_server/ds_publish.c \
         runtime/data_server/ds_lookup.c \

src/tools/prte/Makefile.am

@@ -37,19 +37,19 @@ AM_CFLAGS = \
             -DPRTE_REPO_REV="\"@PRTE_REPO_REV@\"" \
             -DPMIX_RELEASE_DATE="\"@PMIX_RELEASE_DATE@\""
 
-bin_PROGRAMS = prte
+bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte
 
-prte_SOURCES = \
+@PRTE_BINARY_PREFIX@prte_SOURCES = \
         prte.c
 
-prte_LDADD = \
+@PRTE_BINARY_PREFIX@prte_LDADD = \
     $(prte_libevent_LIBS) \
     $(prte_hwloc_LIBS) \
     $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
+        $(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la
 
 install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f prterun$(EXEEXT); $(LN_S) prte$(EXEEXT) prterun$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f prterun$(EXEEXT); $(LN_S) @PRTE_BINARY_PREFIX@prte$(EXEEXT) prterun$(EXEEXT))
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/prterun$(EXEEXT)

src/tools/prte_info/Makefile.am

@@ -41,7 +41,7 @@ AM_CFLAGS = \
 AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS)
 
 #Applied binary prefix to the names
-bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte_info
+bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte-info
 
 @PRTE_BINARY_PREFIX@prte_info_SOURCES = \
         pinfo.h \
@@ -60,7 +60,7 @@ bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte_info
 if PRTE_WANT_LEGACY_TOOLS
 
 install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f prte_info$(EXEEXT); $(LN_S) prte-info$(EXEEXT) prte_info$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f prte_info$(EXEEXT); $(LN_S) @PRTE_BINARY_PREFIX@prte-info$(EXEEXT) prte_info$(EXEEXT))
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/prte_info$(EXEEXT)

src/tools/prun/Makefile.am

@@ -56,7 +56,7 @@ bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte-submit
 if PRTE_WANT_LEGACY_TOOLS
 
 install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f prun$(EXEEXT); $(LN_S) prte-submit$(EXEEXT) prun$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f prun$(EXEEXT); $(LN_S) @PRTE_BINARY_PREFIX@prte-submit$(EXEEXT) prun$(EXEEXT))
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/prun$(EXEEXT)

src/tools/pterm/Makefile.am

@@ -39,7 +39,7 @@ bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte-term
 if PRTE_WANT_LEGACY_TOOLS
 
 install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f pterm$(EXEEXT); $(LN_S) prte-term$(EXEEXT) pterm$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f pterm$(EXEEXT); $(LN_S) @PRTE_BINARY_PREFIX@prte-term$(EXEEXT) pterm$(EXEEXT))
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/pterm$(EXEEXT)