From 490aed99b8f387e27412cbfe13ee943ac1b2a62f Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 2 Dec 2015 21:18:51 +0100 Subject: [PATCH] fix multiple builds of xupnpd --- make/applications.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 0810a68..3f6554c 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -615,7 +615,8 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX) XUPNP_DEFREF = r404 XUPNP_DL_PATH = http://tsdemuxer.googlecode.com/svn/trunk/xupnpd -$(BUILD_TMP)/xupnpd/src/Makefile: +#$(BUILD_TMP)/xupnpd/src/Makefile: +$(D)/xupnpd_$(XUPNP_DEFREF): if [ -e $(BUILD_TMP)/xupnpd ]; then \ rm -fr $(BUILD_TMP)/xupnpd; \ fi; \ @@ -628,7 +629,8 @@ $(BUILD_TMP)/xupnpd/src/Makefile: git checkout $$ID; \ git checkout -b work; \ git am $(PATCHES)/xupnpd/svn$(XUPNP_DEFREF)/*.patch; \ - git rebase master + git rebase master; \ + touch $@ xupnpd-update: $(BUILD_TMP)/xupnpd/src/Makefile | $(TARGETPREFIX) cd $(BUILD_TMP)/xupnpd; \ @@ -647,7 +649,7 @@ xupnpd-update: $(BUILD_TMP)/xupnpd/src/Makefile | $(TARGETPREFIX) echo "No changes..."; \ fi -$(D)/xupnpd: $(D)/udpxy $(D)/lua $(BUILD_TMP)/xupnpd/src/Makefile | $(TARGETPREFIX) +$(D)/xupnpd: $(D)/udpxy $(D)/lua $(D)/xupnpd_$(XUPNP_DEFREF) | $(TARGETPREFIX) set -e; cd $(BUILD_TMP)/xupnpd; \ git checkout work; \ cd src; \ -- 2.39.5