Hi,

While waiting for a new release  of EMMS, I have uploaded a git snapshot
in  Debian (experimental).   Thus, in  case of  there is  no  new stable
release of EMMS before the freeze  for the next version of Debian, I can
still put this git snapshot instead of an old 3.0.

I have  attached two  patches fixing the  Makefile (the second  one also
removes deb-install  rule which is  not used anymore and  thus useless).
Could you please push them if you think they are correct? Thanks much!

Regards,
--
Arnaud Fontaine (arnau)

>From 34b6a13579a623cd4cb959dcc7da1e0f9404ecf8 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <[email protected]>
Date: Thu, 29 Jul 2010 21:39:36 +0100
Subject: [PATCH 1/2] Compile emms-print-metadata in the top source directory rather than src/.

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 080120c..4bb6e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ docs:
 	$(MAKE) -C $(DOCDIR)
 
 emms-print-metadata: $(SRCDIR)/emms-print-metadata.c
-	$(CC) -o $(SRCDIR)/$@ $< `taglib-config --cflags --libs` -ltag_c
+	$(CC) -o $@ $< `taglib-config --cflags --libs` -ltag_c
 
 install:
 	test -d $(SITELISP) || mkdir -p $(SITELISP)
-- 
1.7.1

>From 486c99496c03dfc9da6beae5224d5aeecd619119 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <[email protected]>
Date: Thu, 29 Jul 2010 21:44:26 +0100
Subject: [PATCH 2/2] Now using Git, so get rid of darcs in ChangeLog Makefile target.

---
 Makefile |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4bb6e8d..525e9e9 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -46,11 +47,8 @@ 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
@@ -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 \
-- 
1.7.1

_______________________________________________
Emms-help mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emms-help

Reply via email to