X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=ipv6%2Fgw6c%2FMakefile;h=5834b58adb78be3914d5befa499829de32c15f06;hb=f907dabbe7e3103f57a27d89618bf3bba949776c;hp=581f09ec92a99d7ba3ae61907199eb36a4762f13;hpb=a92ecc63fe668c72b31ecd87e62c7228657e58c2;p=packages.git

diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile
index 581f09ec9..5834b58ad 100644
--- a/ipv6/gw6c/Makefile
+++ b/ipv6/gw6c/Makefile
@@ -1,7 +1,6 @@
 # 
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
@@ -37,7 +36,7 @@ endef
 GW6C_OPTS:= \
 	C_COMPILER="$(TARGET_CC) -c -DNO_STDLIBCXX" \
 	COMPILER="$(TARGET_CROSS)g++ -c -DNO_STDLIBCXX" \
-	CPP_FLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -I. -Wall -DNDEBUG -I$(STAGING_DIR)/usr/include/uClibc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+	CPP_FLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -I. -Wall -DNDEBUG -I$(STAGING_DIR)/usr/include/uClibc++ $(TARGET_CPPFLAGS)" \
 	RANLIB="$(TARGET_CROSS)ranlib" \
 	ARCHIVER="$(TARGET_CROSS)ar" \
 	C_LINKER="$(TARGET_CC)" \
@@ -56,7 +55,7 @@ define Build/Compile
 			-I$(PKG_BUILD_DIR)/gw6c/src/gw6c/platform/openwrt -I$(PKG_BUILD_DIR)/gw6c/src/gw6c" \
 		LDFLAGS="-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cconfig \
 			-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cmessaging \
-			-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
+			$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
 		target="openwrt" \
 		installdir="$(PKG_INSTALL_DIR)"
 endef