@@ -4,19 +4,21 @@ RELEASE ?= tl3
44export RELEASE
55
66targets := droptrace nodetrace src legacy
7- targets-call = for i in $^ ; do make -C $$i $@ ; done
7+ targets-call = for i in $^ ; do make $1 -C $$i $@ ; done
88man-target := script/zh_CN/nettrace.8
99
10- ROOT := $(abspath .)
10+ ROOT := $(abspath .)
1111export ROOT
12- PREFIX ?= ./output
13- PREFIX := $(abspath $(PREFIX ) )
14- MAN_DIR := $(PREFIX ) /usr/share/man
15- BCOMP := ${PREFIX}/usr/share/bash-completion/completions/
12+ PREFIX ?= ./output
13+ PREFIX := $(abspath $(PREFIX ) )
14+ MAN_DIR := $(PREFIX ) /usr/share/man
15+ BCOMP := ${PREFIX}/usr/share/bash-completion/completions/
1616export PREFIX
17- SCRIPT = $(ROOT ) /script
17+ SCRIPT = $(ROOT ) /script
1818export SCRIPT
19- SOURCE_DIR := ~/rpmbuild/SOURCES/nettrace-${VERSION}
19+ SOURCE_DIR := ~/rpmbuild/SOURCES/nettrace-${VERSION}
20+ PACK_TARGET := nettrace-$(VERSION ) -$(RELEASE )
21+ PACK_PATH := $(abspath $(PREFIX ) /$(PACK_TARGET ) )
2022
2123all clean :: $(targets )
2224 $(call targets-call)
@@ -42,13 +44,11 @@ install: man $(targets)
4244 @mkdir -p $(BCOMP); cd $(BCOMP); cp $(SCRIPT)/bash-completion.sh \
4345 ./nettrace; ln -s nettrace droptrace
4446
45- PACK_TARGET := nettrace-$(VERSION ) -$(RELEASE )
4647pack : $(targets )
47- @mkdir -p $(PREFIX ) /$(PACK_TARGET )
48- $(call targets-call)
49- @cd $(PREFIX ) && ls -p | grep -v / | xargs -I % mv % \
50- $(PACK_TARGET ) && \
51- tar -cjf $(PACK_TARGET ) .tar.bz2 $(PACK_TARGET )
48+ @make clean
49+ @rm -rf $(PACK_PATH ) && mkdir -p $(PACK_PATH )
50+ $(call targets-call,PREFIX=$(PACK_PATH ) )
51+ @cd $(PREFIX ) && tar -cjf $(PACK_TARGET ) .tar.bz2 $(PACK_TARGET )
5252
5353rpm :
5454 @make clean
0 commit comments