Fixed some problems in the Makefile which caused it to grab wrong version/user
information for upload.
This commit is contained in:
parent
670d691e1a
commit
dbf996d888
5
Makefile
5
Makefile
@ -2,7 +2,8 @@ all install clean distclean:
|
|||||||
$(MAKE) -C src $@
|
$(MAKE) -C src $@
|
||||||
|
|
||||||
PACKAGE=sysvinit
|
PACKAGE=sysvinit
|
||||||
VERSION=$(shell git describe --tags --abbrev=4 HEAD 2>/dev/null | tr %_ :~)
|
VERSION=$(shell git describe --tags --abbrev=0 HEAD 2>/dev/null)
|
||||||
|
GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g')
|
||||||
override TARBALL=$(PACKAGE)-$(VERSION).tar.xz
|
override TARBALL=$(PACKAGE)-$(VERSION).tar.xz
|
||||||
override TARBALL_LATEST=$(PACKAGE)-latest.tar.xz
|
override TARBALL_LATEST=$(PACKAGE)-latest.tar.xz
|
||||||
override SFTPBATCH=upload-$(VERSION)-sftpbatch
|
override SFTPBATCH=upload-$(VERSION)-sftpbatch
|
||||||
@ -11,7 +12,7 @@ dist: $(TARBALL)
|
|||||||
@echo "tarball $(TARBALL) ready"
|
@echo "tarball $(TARBALL) ready"
|
||||||
|
|
||||||
upload: $(SFTPBATCH)
|
upload: $(SFTPBATCH)
|
||||||
echo @sftp -b $< dl.sv.nongnu.org:/releases/$(PACKAGE)
|
echo @sftp -b $< $(GITLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE)
|
||||||
|
|
||||||
$(SFTPBATCH): $(TARBALL).sig
|
$(SFTPBATCH): $(TARBALL).sig
|
||||||
@echo progress > $@
|
@echo progress > $@
|
||||||
|
Loading…
Reference in New Issue
Block a user