[Gsrc-commit] /srv/bzr/gsrc/trunk r1167: clean up mediagoblin

[Brandon Invergo]

------------------------------------------------------------
revno: 1167
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-14 23:55:54 +0100
message:
  clean up mediagoblin
added:
  gnu/mediagoblin/config.mk
modified:
  gnu/mediagoblin/Makefile

=== modified file 'gnu/mediagoblin/Makefile'
--- a/gnu/mediagoblin/Makefile  2012-09-22 13:05:56 +0000
+++ b/gnu/mediagoblin/Makefile  2012-11-14 22:55:54 +0000
@@ -1,25 +1,24 @@
 GARNAME = mediagoblin
 GARVERSION = 0.3.1
+HOME_URL = http://www.mediagoblin.org
+DESCRIPTION = A free, federated media sharing platform
+
+######################################################################
 
 MASTER_SITES = git://gitorious.org/
-MASTER_SUBDIR = mediagoblin/
-GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)mediagoblin.git
-
+MASTER_SUBDIR = $(GARNAME)/
+GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)$(GARNAME).git
 DISTFILES = $(DISTNAME).tar.gz $(DISTNAME)-configure.tar.gz
-#SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.mediagoblin.org
-DESCRIPTION = A free, federated media sharing platform
+SIGFILES = 
+
+BUILDDEPS = 
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
-
-# If you want to install to a Python virtualenv, you can do so here, but be 
sure to 
-# set a very explicit prefix, otherwise it will just install directly into 
your gsrc 
-# prefix, which would defeat the purpose.
-
-#CONFIGURE_OPTS = --with-virtualenv 
--prefix=$(prefix)/www/mediagoblin.example.com 
+include config.mk
+
+
 
 

=== added file 'gnu/mediagoblin/config.mk'
--- a/gnu/mediagoblin/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/mediagoblin/config.mk 2012-11-14 22:55:54 +0000
@@ -0,0 +1,7 @@
+## Configuration options for mediagoblin ##
+
+# If you want to install to a Python virtualenv, you can do so here, but be 
sure to 
+# set a very explicit prefix, otherwise it will just install directly into 
your gsrc 
+# prefix, which would defeat the purpose.
+CONFIGURE_OPTS ?= --with-virtualenv 
--prefix=$(prefix)/www/mediagoblin.example.com 
+BUILD_OPTS ?=