Преглед на файлове

carrierroute: fix cross-compilation

Ovidiu Sas преди 12 години
родител
ревизия
f9c0980c4f
променени са 1 файла, в които са добавени 6 реда и са изтрити 4 реда
  1. 6 4
      modules/carrierroute/Makefile

+ 6 - 4
modules/carrierroute/Makefile

@@ -9,15 +9,17 @@ include ../../Makefile.defs
 auto_gen=
 auto_gen=
 NAME=carrierroute.so
 NAME=carrierroute.so
 
 
+ifeq ($(CROSS_COMPILE),)
 BUILDER = $(shell which confuse-config)
 BUILDER = $(shell which confuse-config)
+endif
 
 
 ifeq ($(BUILDER),)
 ifeq ($(BUILDER),)
+	ifeq ($(CROSS_COMPILE),)
 	BUILDER = $(shell which pkg-config)
 	BUILDER = $(shell which pkg-config)
+	endif
 	ifeq ($(BUILDER),)
 	ifeq ($(BUILDER),)
-		CONFUSEDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
-			-I/usr/sfw/include
-		CONFUSELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
-			-L/opt/lib -lconfuse
+		CONFUSEDEFS=-I$(LOCALBASE)/include
+		CONFUSELIBS=-L$(LOCALBASE)/lib -lconfuse
 	else
 	else
 		CONFUSEDEFS = $(shell pkg-config --cflags libconfuse)
 		CONFUSEDEFS = $(shell pkg-config --cflags libconfuse)
 		CONFUSELIBS = $(shell pkg-config --libs libconfuse)
 		CONFUSELIBS = $(shell pkg-config --libs libconfuse)