diff --git a/evoice/Makefile b/evoice/Makefile
index e533c567b..94e47b2d0 100644
--- a/evoice/Makefile
+++ b/evoice/Makefile
@@ -56,17 +56,21 @@ MY_TEMP_IOPSYS_DIR:=/media/grbi/home/grbi/voip/iopsysWrtEco
 IDIR = $(STAGING_DIR)/usr/include
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	TARGET_PLATFORM_BROADCOM=y
+	TARGET_PLATFORM=BROADCOM
 	BDIR = bcm963xx/userspace/private/apps/voice
-	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
+	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
+		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
+		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-	TARGET_PLATFORM_ECONET=y
+	TARGET_PLATFORM=ECONET
 	CC_FLAGS = -I$(IDIR) -I$(MY_TEMP_IOPSYS_DIR)/voip_lib
 	_XFLAGS=-L$(MY_TEMP_IOPSYS_DIR)/voip_lib/voip
 	TRG=SVrgMtekOwrt
 endif
 
+export TARGET_PLATFORM
+
 #used and altered by BIDE makefiles
 export _XFLAGS
 
@@ -74,21 +78,17 @@ BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk CC_FLAGS="$(CC_F
 	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg
 
 define Build/Compile
-	$(if $(TARGET_PLATFORM_BROADCOM), @echo "TARGET_PLATFORM = BROADCOM")
-	$(if $(TARGET_PLATFORM_ECONET), @echo "TARGET_PLATFORM = ECONET")
-
+	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
 	+$(MAKE) $(BIDE_MAKE_OPTS) TRG=$(TRG)
-
-	$(if $(TARGET_PLATFORM_BROADCOM), +$(MAKE) $(BIDE_MAKE_OPTS) TRG=libvoiceservice)
+	+$(MAKE) $(BIDE_MAKE_OPTS) TRG=libvoiceservice
 endef
 
 define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
-
-	$(if $(TARGET_PLATFORM_BROADCOM), $(INSTALL_DIR) $(1)/usr/lib/bbfdm)
-	$(if $(TARGET_PLATFORM_BROADCOM), $(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
 endef
 
 $(eval $(call BuildPackage,evoice))