upgrade dnsmasq, fixes a few bugs including #943

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 4947cbf..eed9335 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,12 @@ SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${shell pwd}
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${shell pwd}

-include $(TOPDIR)/include/verbose.mk

 ifeq ($(KBUILD_VERBOSE),99)
   MAKE:=3>/dev/null $(MAKE)
 endif
 ifeq ($(KBUILD_VERBOSE),99)
   MAKE:=3>/dev/null $(MAKE)
 endif

+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
+include $(TOPDIR)/include/verbose.mk

 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)


@@ -37,12 +39,12 @@ else
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts Makefile),tmp/.pkginfo)
-  tmp/.pkginfo: tmpinfo-clean
+ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
+  tmp/.pkginfo: FORCE

 endif
 
 endif
 

-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts Makefile),tmp/.targetinfo)
-  tmp/.targetinfo: tmpinfo-clean
+ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
+  tmp/.targetinfo: FORCE

 endif
 
 ifeq ($(FORCE),)
 endif
 
 ifeq ($(FORCE),)