summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f3e274d)
raw | patch | inline | side by side (parent: f3e274d)
author | Chris Ring <cring@ti.com> | |
Tue, 8 Apr 2014 20:58:53 +0000 (13:58 -0700) | ||
committer | Chris Ring <cring@ti.com> | |
Wed, 9 Apr 2014 19:57:51 +0000 (12:57 -0700) |
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.
via the --prefix= option to ./configure.
Also relocate the DESTDIR variable definition in products.mak to
reflect it's used outside of QNX.
ipc-linux.mak | patch | blob | history | |
products.mak | patch | blob | history |
diff --git a/ipc-linux.mak b/ipc-linux.mak
index b0813e779a16ecd7e06ff0081e1a008a65c76d2b..68e9617232e2c8f9c0f7b64e89843fad2d9cc3f8 100644 (file)
--- a/ipc-linux.mak
+++ b/ipc-linux.mak
#
-# 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
#
# 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) \
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) \
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
#
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 ####################
#
QNX_INSTALL_DIR =
-# Destination for target binaries
-#
-DESTDIR =
#################### IPC Bios ####################