diff options
-rw-r--r-- | Makefile | 20 | ||||
-rwxr-xr-x | mkdeb.sh | 4 |
2 files changed, 12 insertions, 12 deletions
@@ -221,14 +221,14 @@ dist: config.mk | |||
221 | make distclean | 221 | make distclean |
222 | mv config.status.old config.status | 222 | mv config.status.old config.status |
223 | mv config.sh.old config.sh | 223 | mv config.sh.old config.sh |
224 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz | 224 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz |
225 | mkdir -p $(NAME)-$(VERSION)/test | 225 | mkdir -p $(TARNAME)-$(VERSION)/test |
226 | cp -a $(DISTFILES) $(NAME)-$(VERSION) | 226 | cp -a $(DISTFILES) $(TARNAME)-$(VERSION) |
227 | cp -a $(DISTFILES_TEST) $(NAME)-$(VERSION)/test | 227 | cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test |
228 | rm -rf $(NAME)-$(VERSION)/src/tools | 228 | rm -rf $(TARNAME)-$(VERSION)/src/tools |
229 | find $(NAME)-$(VERSION) -name .svn -delete | 229 | find $(TARNAME)-$(VERSION) -name .svn -delete |
230 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) | 230 | tar -cJvf $(TARNAME)-$(VERSION).tar.xz $(TARNAME)-$(VERSION) |
231 | rm -fr $(NAME)-$(VERSION) | 231 | rm -fr $(TARNAME)-$(VERSION) |
232 | 232 | ||
233 | asc: config.mk | 233 | asc: config.mk |
234 | ./mkasc.sh $(VERSION) | 234 | ./mkasc.sh $(VERSION) |
@@ -240,11 +240,11 @@ deb-apparmor: dist config.sh | |||
240 | ./mkdeb.sh -apparmor --enable-apparmor | 240 | ./mkdeb.sh -apparmor --enable-apparmor |
241 | 241 | ||
242 | test-compile: dist config.mk | 242 | test-compile: dist config.mk |
243 | cd test/compile; ./compile.sh $(NAME)-$(VERSION) | 243 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) |
244 | 244 | ||
245 | .PHONY: rpms | 245 | .PHONY: rpms |
246 | rpms: src/man config.mk | 246 | rpms: src/man config.mk |
247 | ./platform/rpm/mkrpm.sh $(NAME) $(VERSION) | 247 | ./platform/rpm/mkrpm.sh $(TARNAME) $(VERSION) |
248 | 248 | ||
249 | extras: all | 249 | extras: all |
250 | $(MAKE) -C extras/firetools | 250 | $(MAKE) -C extras/firetools |
@@ -14,8 +14,8 @@ EXTRA_VERSION=$1 | |||
14 | 14 | ||
15 | test "$#" -gt 0 && shift | 15 | test "$#" -gt 0 && shift |
16 | 16 | ||
17 | CODE_ARCHIVE="$NAME-$VERSION.tar.xz" | 17 | CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz" |
18 | CODE_DIR="$NAME-$VERSION" | 18 | CODE_DIR="$TARNAME-$VERSION" |
19 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" | 19 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" |
20 | DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" | 20 | DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" |
21 | 21 | ||