Repository : ssh://git@open-mesh.org/batman-adv

On branches: master,next

commit bb65406585cab638a51aa62be87849bf613335f1 Merge: 83e3cb3 22c0857 Author: Sven Eckelmann sven@narfation.org Date: Tue Nov 1 08:19:39 2016 +0100

Merge branch 'maint'

bb65406585cab638a51aa62be87849bf613335f1 Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)

diff --cc Makefile index 1d2e01c,b852a17..e9c499f --- a/Makefile +++ b/Makefile @@@ -52,8 -45,8 +52,9 @@@ RM ?= rm - MKDIR := mkdir -p PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- PATCH := patch $(PATCH_FLAGS) -i +SPATCH_FLAGS := --in-place --relax-include-path --use-coccigrep --very-quiet CP := cp -fpR + LN := ln -sf

SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile @@@ -107,8 -100,9 +108,9 @@@ install: config $(SOURCE_STAMP config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h

-$(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh +$(SOURCE_STAMP): $(SOURCE) compat-patches/* $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(LN) ../Makefile $(BUILD_DIR)/Makefile @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @set -e; \