File tree 1 file changed +5
-4
lines changed
1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change 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// ')
3
3
4
4
EMACS = emacs
5
5
EFLAGS =
@@ -60,17 +60,18 @@ dist: $(DIST_TGZ)
60
60
61
61
# Generate ELPA-compatible package
62
62
package : $(PKG_TAR )
63
+ elpa : $(PKG_TAR )
63
64
64
65
$(PKG_TAR ) : $(PKG_DIST_FILES ) haskell-mode-pkg.el.in
65
- @echo " VERSION = $( VERSION) "
66
- @echo " GIT_VERSION = $( GIT_VERSION) "
67
66
rm -rf haskell-mode-$(VERSION )
68
67
mkdir haskell-mode-$(VERSION )
69
68
cp $(PKG_DIST_FILES ) haskell-mode-$(VERSION ) /
70
69
sed -e ' s/@VERSION@/$(VERSION)/g' < haskell-mode-pkg.el.in > haskell-mode-$(VERSION ) /haskell-mode-pkg.el
71
70
sed -e ' s/@GIT_VERSION@/$(GIT_VERSION)/g;s/@VERSION@/$(VERSION)/g' < haskell-mode.el > haskell-mode-$(VERSION ) /haskell-mode.el # NO_DIST
72
71
tar cvf $@ haskell-mode-$(VERSION )
73
72
rm -rf haskell-mode-$(VERSION )
73
+ @echo
74
+ @echo " Created ELPA compatible distribution package '$@ ' from $( GIT_VERSION) "
74
75
75
76
$(AUTOLOADS ) : $(ELFILES ) haskell-mode.elc
76
77
[ -f $@ ] || echo ' ' > $@
You can’t perform that action at this time.
0 commit comments