diff options
| author | Yoni Rabkin <yoni@rabkins.net> | 2010-09-16 21:46:34 -0400 |
|---|---|---|
| committer | Yoni Rabkin <yoni@rabkins.net> | 2010-09-16 21:46:34 -0400 |
| commit | 92ca880c626bb859aa082f34ba6f3fcfc7d3b0ce (patch) | |
| tree | f4ec5ce696bccf972b0ee1452e5a069a1804f01b | |
| parent | f33c4aae2185e6f7d12721c4aa96f80403b51ba0 (diff) | |
| parent | e6aba649520ec44425060863e1c35ed01c53fd4b (diff) | |
Merge branch 'master' of ssh://yonirabkin@git.sv.gnu.org/srv/git/emms
| -rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -14,6 +14,7 @@ MAN1DIR=$(PREFIX)/share/man/man1 SITELISP=$(PREFIX)/share/emacs/site-lisp/emms INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR) +CHANGELOG_CMD = git log --pretty=medium # The currently released version of EMMS VERSION=3.0 @@ -32,7 +33,7 @@ docs: $(MAKE) -C $(DOCDIR) emms-print-metadata: $(SRCDIR)/emms-print-metadata.c - $(CC) -o $(SRCDIR)/$@ $< `taglib-config --cflags --libs` -ltag_c + $(CC) $(CFLAGS) $(LDFLAGS) -o $(SRCDIR)/$@ $< `taglib-config --cflags --libs` -ltag_c install: test -d $(SITELISP) || mkdir -p $(SITELISP) @@ -46,14 +47,11 @@ install: remove-info: $(INSTALLINFO) --remove emms.info -deb-install: - install -m 644 $(ALLSOURCE) $(SITELISP) - ChangeLog: - darcs changes > $@ + $(CHANGELOG_CMD) > $@ clean: - -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata + -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html $(SRCDIR)/emms-print-metadata $(MAKE) -C $(LISPDIR) clean dist: clean autoloads @@ -61,7 +59,7 @@ dist: clean autoloads (cd .. && tar xf -) rm -f ../emms-$(VERSION)/.gitignore cp lisp/emms-auto.el ../emms-$(VERSION)/lisp - git log --pretty=medium > ../emms-$(VERSION)/ChangeLog + $(CHANGELOG_CMD) > ../emms-$(VERSION)/ChangeLog release: dist (cd .. && tar -czf emms-$(VERSION).tar.gz \ |