From cda6921371822480f2d8ba86a5de34fe324b3bc6 Mon Sep 17 00:00:00 2001 From: Fabien Tassin Date: Sun, 30 Dec 2007 22:03:12 +0100 Subject: * Fix clean-up script path substitution - update src/Makefile - update src/mozclient.mk.in --- src/Makefile | 2 +- src/mozclient.mk.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 960b483..20a1261 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,7 +40,7 @@ extra_mk_files = \ %.mk: %.mk.in cat $< | sed \ -e "s|^\(include\) \(.*\)\.in|\1 $(DATADIR)/\2|" \ - -e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ ][ ]*\)\(.*\)|\1$(DATADIR)/\2|" \ + -e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ ][ ]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \ > $@ chmod 644 $@ diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in index 4dcc98d..df64d9d 100644 --- a/src/mozclient.mk.in +++ b/src/mozclient.mk.in @@ -81,7 +81,7 @@ MOZCLIENT_CVS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot MOZCLIENT_STAMP ?= stamped MOZCLIENT_TMP := mozclient-tmp -MOZCLIENT_EXCLUDE_SCRIPT := remove.binonly.sh +MOZCLIENT_EXCLUDE_SCRIPT := ../../remove.binonly.sh NOBINONLY := nobinonly TAR_EXCLUDE := --exclude=CVS --exclude=.cvsignore @@ -168,7 +168,7 @@ mozclient-checkout: # Remove bin-only files using the remove.binonly.sh script. # Keep a log in REMOVED+nobinonly.txt mozclient-remove-bin: - cd $(MOZCLIENT_TMP)/mozilla && sh ../../$(MOZCLIENT_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 + cd $(MOZCLIENT_TMP)/mozilla && sh $(MOZCLIENT_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 if [ ! -s $(MOZCLIENT_TMP)/mozilla/REMOVED+$(NOBINONLY).txt ] ; then rm $(MOZCLIENT_TMP)/mozilla/REMOVED+$(NOBINONLY).txt ; fi # Pack -- cgit v1.2.3