Skip to content

Commit d86c4d2

Browse files
committed
Adapt Makefile to consider only tags matching v[0-9]* (re #145)
1 parent 29ff368 commit d86c4d2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION = $(shell git describe --tags --abbrev=0 | sed 's/_/\./g')
2-
GIT_VERSION = $(shell git describe --tags --dirty | sed 's/_/\./g')
1+
VERSION = $(shell git describe --tags --match 'v[0-9]*' --abbrev=0 | sed 's/_/\./g;s/^v//')
2+
GIT_VERSION = $(shell git describe --tags --match 'v[0-9]*' --dirty | sed 's/_/\./g;s/^v//')
33

44
EMACS = emacs
55
EFLAGS =
@@ -60,17 +60,18 @@ dist: $(DIST_TGZ)
6060

6161
# Generate ELPA-compatible package
6262
package: $(PKG_TAR)
63+
elpa: $(PKG_TAR)
6364

6465
$(PKG_TAR): $(PKG_DIST_FILES) haskell-mode-pkg.el.in
65-
@echo "VERSION = $(VERSION)"
66-
@echo "GIT_VERSION = $(GIT_VERSION)"
6766
rm -rf haskell-mode-$(VERSION)
6867
mkdir haskell-mode-$(VERSION)
6968
cp $(PKG_DIST_FILES) haskell-mode-$(VERSION)/
7069
sed -e 's/@VERSION@/$(VERSION)/g' < haskell-mode-pkg.el.in > haskell-mode-$(VERSION)/haskell-mode-pkg.el
7170
sed -e 's/@GIT_VERSION@/$(GIT_VERSION)/g;s/@VERSION@/$(VERSION)/g' < haskell-mode.el > haskell-mode-$(VERSION)/haskell-mode.el #NO_DIST
7271
tar cvf $@ haskell-mode-$(VERSION)
7372
rm -rf haskell-mode-$(VERSION)
73+
@echo
74+
@echo "Created ELPA compatible distribution package '$@' from $(GIT_VERSION)"
7475

7576
$(AUTOLOADS): $(ELFILES) haskell-mode.elc
7677
[ -f $@ ] || echo ' ' >$@

0 commit comments

Comments
 (0)