[Gsrc-commit] /srv/bzr/gsrc/trunk r996: clean up emms and fix broken build script

[Brandon Invergo]

------------------------------------------------------------
revno: 996
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 13:13:52 +0100
message:
  clean up emms and fix broken build script
added:
  gnu/emms/config.mk
modified:
  gnu/emms/Makefile

=== modified file 'gnu/emms/Makefile'
--- a/gnu/emms/Makefile 2010-06-11 09:29:17 +0000
+++ b/gnu/emms/Makefile 2012-10-28 12:13:52 +0000
@@ -1,16 +1,43 @@
 GARNAME = emms
 GARVERSION = 3.0
+HOME_URL = http://www.gnu.org/software/emms/
+DESCRIPTION = GNU EMMS, The Emacs Multimedia System
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = emms/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = $(WORKOBJ)/Makefile
+INSTALL_SCRIPTS = $(WORKOBJ)/Makefile-DESTDIR
 
 BUILDDEPS = emacs texinfo
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/emms/
-DESCRIPTION = GNU EMMS, The Emacs Multimedia System
-
-include ../../gar.lib/auto.mk
+LIBDEPS = 
+
+######################################################################
+
+include ../../gar.mk
+include config.mk
+
+INSTALL_ARGS = MAN1PAGES= \
+              INSTALLINFO="$(prefix)/bin/install-info 
--infodir=$(prefix)/share/info"
+
+build-%/Makefile:
+       $(BUILD_ENV) $(MAKE) -C $* all $(BUILD_OPTS)
+       $(MAKECOOKIE)
+
+install-%/Makefile:
+       @echo " ==> Running make $(INSTALL_TARGET) in $*"
+       $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS) \
+               PREFIX=$(packageprefix)/usr $(INSTALL_TARGET)
+       $(MAKECOOKIE)
+
+install-%/Makefile-DESTDIR:
+       @echo " ==> Running make $(INSTALL_TARGET) with DESTDIR in $*"
+       $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS) \
+               DESTDIR=$(packageDESTDIR) \
+               PREFIX=$(DESTDIR)$(packageprefix)/usr \
+               $(INSTALL_TARGET)
+       $(MAKECOOKIE)

=== added file 'gnu/emms/config.mk'
--- a/gnu/emms/config.mk        1970-01-01 00:00:00 +0000
+++ b/gnu/emms/config.mk        2012-10-28 12:13:52 +0000
@@ -0,0 +1,3 @@
+## Configuration options for emms ##
+
+BUILD_OPTS ?=