3 files changed, 83 insertions, 2 deletions
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index 18143c0a1..5deb3c83f 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -24,15 +24,17 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
+TARGET_CFLAGS+=		-Wall
+TARGET_CPPFLAGS+=	-D_REENTRANT
+
 do-build:
 	mkdir -p ${WRKINST}/usr
 	${MAKE} -C ${WRKBUILD}/server/libgsm \
 		${TARGET_CONFIGURE_OPTS} \
-		CCINC="${TCPPFLAGS}" \
+		CCINC="${TARGET_CPPFLAGS}" \
 		lib/libgsm.a
 	${MAKE} -C ${WRKBUILD}/server \
 		${TARGET_CONFIGURE_OPTS} \
-		CFLAGS="-Wall -D_REENTRANT ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}" \
 		palantir
 
 do-install:
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile
new file mode 100644
index 000000000..a9bc81951
--- /dev/null
+++ b/package/palantir/patches/patch-server_Makefile
@@ -0,0 +1,26 @@
+--- palantir-2.7.orig/server/Makefile	2007-05-19 01:31:36.000000000 +0200
++++ palantir-2.7/server/Makefile	2011-01-20 15:24:19.478658283 +0100
+@@ -47,10 +47,11 @@ ENABLE_X11MON=	0
+ .PHONY : tools man
+ 
+ 
+-CFLAGS= -Wall -D_REENTRANT -O2 -g
++CFLAGS?= -Wall -D_REENTRANT -O2 -g
+ # -O3
+-CC= gcc
+-libjpeg= -ljpeg
++CC?= gcc
++LIBS?=
++LIBS+= -ljpeg -lpthread
+ 
+ ifeq ($(TARGET),mips)
+ 	BROADCOM_SRC= /usr/local/broadcom/src
+@@ -86,7 +87,7 @@ SRCS= *.c
+ libgsm= libgsm/lib/libgsm.a
+ 
+ palantir: $(libgsm) $(OBJ) tools man
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir
++	$(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir
+ 
+ mips:
+ 	make TARGET=mips palantir
diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile
new file mode 100644
index 000000000..079e9a825
--- /dev/null
+++ b/package/palantir/patches/patch-server_libgsm_Makefile
@@ -0,0 +1,53 @@
+--- palantir-2.7.orig/server/libgsm/Makefile	2007-03-31 11:50:49.000000000 +0200
++++ palantir-2.7/server/libgsm/Makefile	2011-01-20 15:22:46.318658281 +0100
+@@ -49,11 +49,11 @@ WAV49	= -DWAV49
+ # CCFLAGS 	= -c -O
+ 
+ ifndef CC
+-CC		= gcc
++CC		?= gcc
+ endif
+ 
+-CC		+= -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
++CFLAGS		+= -ansi -pedantic
++CPPFLAGS 	?= -DNeedFunctionPrototypes=1
+ 
+ LD 		= $(CC)
+ 
+@@ -80,7 +80,7 @@ SHELL		= /bin/sh
+ LN		= ln
+ BASENAME 	= basename
+ ifndef AR
+-AR		= ar
++AR		?= ar
+ endif
+ ARFLAGS		= cr
+ RMFLAGS		=
+@@ -89,7 +89,7 @@ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+ # RANLIB 	= true
+ ifndef RANLIB
+-RANLIB	 	= ranlib
++RANLIB	 	?= ranlib
+ endif
+ 
+ #
+@@ -109,7 +109,7 @@ INC	= $(ROOT)/inc
+ # DEBUG	= -DNDEBUG
+ ######### Remove -DNDEBUG to enable assertions.
+ 
+-CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS	+= $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+ 	$(WAV49) $(CCINC) -I$(INC)
+ ######### It's $(CC) $(CFLAGS)
+ 
+@@ -177,7 +177,7 @@ GSM_OBJECTS =	$(SRC)/add.o		\
+ # Default rules
+ 
+ .c.o:
+-		$(CC) $(CFLAGS) $?
++		$(CC) $(CPPFLAGS) $(CFLAGS) -c $?
+ 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
+ # Target rules