Linux: Use DESTDIR as configure --prefix option

If the user sets DESTDIR (e.g. in products.mak), pass that value
via the --prefix= option to ./configure.

Also relocate the DESTDIR variable definition in products.mak to
reflect it's used outside of QNX.

diff --git a/ipc-linux.mak b/ipc-linux.mak
index b0813e779a16ecd7e06ff0081e1a008a65c76d2b..68e9617232e2c8f9c0f7b64e89843fad2d9cc3f8 100644 (file)
--- a/ipc-linux.mak
+++ b/ipc-linux.mak
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012-2013, Texas Instruments Incorporated
+#   Copyright (c) 2012-2014, Texas Instruments Incorporated
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -46,10 +46,20 @@ include products.mak
 #
 #            CFLAGS="-DAF_RPMSG=42"
 
+# If the user set DESTDIR (e.g. in products.mak), pass that value via
+# --prefix= option.  If DESTDIR is not set, --prefix is not thrown and
+# configure's defaults are used.
+
+ifeq ($(DESTDIR),)
+PREFIX_OPTION=
+else
+PREFIX_OPTION=--prefix=$(DESTDIR)
+endif
 
 config:
        @echo "Configuring Linux Ipc ..."
        ./configure --host=$(TOOLCHAIN_LONGNAME) \
+            $(PREFIX_OPTION) \
             CC=$(TOOLCHAIN_PREFIX)gcc \
             PLATFORM=$(PLATFORM) \
             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \
@@ -60,6 +70,7 @@ config:
 config-static:
        @echo "Configuring Linux Ipc static only libaries ..."
        ./configure --host=$(TOOLCHAIN_LONGNAME) --disable-shared \
+            $(PREFIX_OPTION) \
             CC=$(TOOLCHAIN_PREFIX)gcc \
             PLATFORM=$(PLATFORM) \
             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \
@@ -70,6 +81,7 @@ config-static:
 config-shared:
        @echo "Configuring Linux Ipc shared (dynamic) only libaries ..."
        ./configure --host=$(TOOLCHAIN_LONGNAME) --disable-static \
+            $(PREFIX_OPTION) \
             CC=$(TOOLCHAIN_PREFIX)gcc \
             PLATFORM=$(PLATFORM) \
             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \

diff --git a/products.mak b/products.mak
index 3851d017ea2ccd3eab8030b601bfcd88cc809a1f..33fbdcea07676f4f6b423271f8e6c34954ac2705 100644 (file)
--- a/products.mak
+++ b/products.mak
@@ -47,6 +47,13 @@ DEPOT = _your_depot_folder_
 #
 PLATFORM =
 
+# Destination when installing the built binaries
+#
+# Note, this is used for Linux (if you use ipc-linux.mak to run the
+# configure command), QNX and BIOS.
+#
+DESTDIR =
+
 
 #################### IPC Linux ####################
 
@@ -75,9 +82,6 @@ CMEM_INSTALL_DIR =
 #
 QNX_INSTALL_DIR =
 
-# Destination for target binaries
-#
-DESTDIR =
 
 #################### IPC Bios ####################