update environment.mk

diff --git a/make/environment.mk b/make/environment.mk
index 0cf24c52575f00089517c3fb8f1bd7d41865d957..032ef0d6fef5de1590302fe750017397ef396a37 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -43,18 +43,14 @@ endif
 
 BOXARCH = arm
 
-TARGET_NEVIS = arm-cx2450x-linux-gnueabi
-TARGET_APOLLO = arm-pnx8400-linux-uclibcgnueabi
-TARGET_KRONOS = arm-pnx8400-linux-uclibcgnueabi
-
 ifeq ($(PLATFORM), nevis)
-       TARGET = $(TARGET_NEVIS)
+       TARGET ?= arm-cx2450x-linux-gnueabi
 endif
 ifeq ($(PLATFORM), apollo)
-       TARGET = $(TARGET_APOLLO)
+       TARGET ?= arm-pnx8400-linux-uclibcgnueabi
 endif
 ifeq ($(PLATFORM), kronos)
-       TARGET = $(TARGET_KRONOS)
+       TARGET ?= arm-pnx8400-linux-uclibcgnueabi
 endif
 
 TARGETLIB       = $(TARGETPREFIX)/lib
@@ -67,9 +63,10 @@ LD_FLAGS        = $(TARGET_LDFLAGS)
 VPATH = $(D)
 
 PATH := $(HOSTPREFIX)/bin:$(CROSS_DIR)/bin:$(PATH)
-PKG_CONFIG = /usr/bin/pkg-config
+#PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG = $(HOSTPREFIX)/bin/$(TARGET)-pkg-config
 PKG_CONFIG_LIBDIR = $(TARGETPREFIX)/lib
-PKG_CONFIG_PATH = $(TARGETPREFIX)/lib/pkgconfig
+PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 
 # helper-"functions":
 REWRITE_LIBTOOL = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)