Merge remote-tracking branch 'origin/ipc-3.23-next' into ipc-next

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

diff --git a/ipc-qnx.mak b/ipc-qnx.mak
index a90e52116b9430adb116587a59b25fdb59f5ade7..a903d7c4908268e5d2ed731e6017aaaa407fbd10 100644 (file)
--- a/ipc-qnx.mak
+++ b/ipc-qnx.mak
@@ -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