SysMin: Update type to match print pattern

[ipc/ipcdev.git] / ipc-qnx.mak

diff --git a/ipc-qnx.mak b/ipc-qnx.mak
index 9025702023596a711115a193f831726ef0ed729f..3006cee40d474e7238c7a9f64a8eef11d96dd40a 100644 (file)
--- a/ipc-qnx.mak
+++ b/ipc-qnx.mak
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012-2014, Texas Instruments Incorporated
+#   Copyright (c) 2012-2015, Texas Instruments Incorporated
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -36,12 +36,10 @@ include ./products.mak
 # Setup QNX paths
 ifneq ($(wildcard $(QNX_INSTALL_DIR)),)
     QNX_PATH := $(QNX_INSTALL_DIR)/host/linux/x86/usr/bin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/bin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/sbin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/host/linux/x86/usr/sbin
-    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/linux/x86/usr/photon/appbuilder
+    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/.qnx/bin
+    QNX_PATH := $(QNX_PATH):$(QNX_INSTALL_DIR)/jre/bin
 
-    export QNX_CONFIGURATION?=$(QNX_INSTALL_DIR)/etc/qnx
+    export QNX_CONFIGURATION?=$(QNX_INSTALL_DIR)/.qnx
     export QNX_HOST?=$(QNX_INSTALL_DIR)/host/linux/x86
     export QNX_TARGET?=$(QNX_INSTALL_DIR)/target/qnx6
     export MAKEFLAGS=-I$(QNX_INSTALL_DIR)/target/qnx6/usr/include
@@ -55,13 +53,20 @@ all: .qnx
 .qnx,%: PATH:=$(QNX_PATH):$(PATH)
 .qnx,%:
        @echo "building Qnx user libraries for \"$(PLATFORM)\" platform..."
+ifneq ("$(QNX_CFLAGS)","")
+       @make -C qnx \
+                IPC_REPO=`pwd` \
+                PLATFORM=$(PLATFORM) \
+                QNX_CFLAGS=$(QNX_CFLAGS)
+else
        @make -C qnx \
                 IPC_REPO=`pwd` \
                 PLATFORM=$(PLATFORM)
+endif
 
 clean:
        @echo "cleaning Qnx user libraries ..."
-       @make -C qnx PLATFORM=$(PLATFORM) clean
+       @make -C qnx PLATFORM=$(PLATFORM) IPC_REPO=`pwd` clean
 
 install: .install,$(PLATFORM)