Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c;
instead the harness should set it.  In Guix we set it explicitly; the
right thing is to use AM_TEST_ENVIRONMENT and regenerate the
makefiles, but we can't regenerate because current autotools carp on
some things, so we patch the Makefile.in instead.

Also fix to not try to create /var/lib/upower if /var isn't writable.

Patch by Andy Wingo <wingo@igalia.com>

--- upower-0.99.2.orig/src/Makefile.in	2014-12-18 10:32:01.000000000 +0100
+++ upower-0.99.2/src/Makefile.in	2015-04-04 19:49:28.020843678 +0200
@@ -780,6 +780,7 @@
 
 @UP_BUILD_TESTS_TRUE@up_self_test_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS_C)
 @UP_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = $(DBUS_LAUNCH)
+@UP_BUILD_TESTS_TRUE@AM_TESTS_ENVIRONMENT = UPOWER_CONF_FILE_NAME=$(top_srcdir)/etc/UPower.conf
 dbusservicedir = $(datadir)/dbus-1/system-services
 dbusservice_in_files = org.freedesktop.UPower.service.in
 dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
@@ -1789,7 +1790,7 @@
 @HAVE_SYSTEMDSYSTEMUNITDIR_TRUE@	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 install-data-hook:
-	if test -w $(DESTDIR)$(prefix)/; then \
+	if test -w $(DESTDIR)$(localstatedir)/; then \
 		mkdir -p $(DESTDIR)$(historydir); \
 	fi
 
--- upower-0.99.2.orig/src/up-self-test.c	2014-07-17 09:46:15.000000000 +0200
+++ upower-0.99.2/src/up-self-test.c	2015-04-04 18:43:04.952741927 +0200
@@ -295,12 +295,6 @@
 #endif
 	g_test_init (&argc, &argv, NULL);
 
-	/* make check, vs. make distcheck */
-	if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS))
-		g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE);
-	else
-		g_setenv ("UPOWER_CONF_FILE_NAME", "../../../etc/UPower.conf", TRUE);
-
 	/* tests go here */
 	g_test_add_func ("/power/backend", up_test_backend_func);
 	g_test_add_func ("/power/device", up_test_device_func);
option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7d57bc4d0d8b34409d795fbbff079eff3486a50d'>root</a>/<a href='/guix/log/gnu?id=7d57bc4d0d8b34409d795fbbff079eff3486a50d'>gnu</a>/<a href='/guix/log/gnu/packages?id=7d57bc4d0d8b34409d795fbbff079eff3486a50d'>packages</a>/<a href='/guix/log/gnu/packages/gstreamer.scm?id=7d57bc4d0d8b34409d795fbbff079eff3486a50d'>gstreamer.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gstreamer.scm?id=7d57bc4d0d8b34409d795fbbff079eff3486a50d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-29 23:17:13 +0200'>2019-06-29</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=55d1d9eb2f0051404d0562622d5d85b701f5a973'>gnu: gstreamer: Fix buffer offset problem.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-06-13 14:08:32 +0200'>2019-06-13</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=2a9d89afb6fb869dd2bdf1e9f710f487786930fc'>gnu: gstreamer: Skip failing test on 32-bit systems.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-05-04 16:53:48 +0200'>2019-05-04</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=c9c63edbde6aaf774d263036d4f14da25c88ed53'>gnu: gstreamer: Update to 1.16.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-05-04 16:53:48 +0200'>2019-05-04</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=46c39e1e47f158c338ac9c4bd4c62e72fe9bf2d2'>gnu: orc: Update to 0.4.29.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-03-16 16:56:29 +0100'>2019-03-16</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=b3aba78b7d8b27d3480990b8f58d953844f1f756'>gnu: gst-plugins-good: Include gstgtk extension.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2019-02-09 20:58:15 +0100'>2019-02-09</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=037d59136763c03243e76ebe5d6e40bed6653333'>gnu: libvpx: Update to 1.8.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-12-04 20:05:21 +0100'>2018-12-04</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=bc148ba47ddc15d1cd7100fb2e67eddbbb7461ec'>gnu: gstreamer: Update to 1.14.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-10-17 20:47:11 +0200'>2018-10-17</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=d02bb02f7d833ad371c53c346b6cb77f01377cf4'>Merge branch 'master' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-10-16 13:40:14 -0400'>2018-10-16</span></td><td><a href='/guix/commit/gnu/packages/gstreamer.scm?id=02d5ed4a2700e8613aaf0642333734b60caff0f7'>gnu: GStreamer plugins: Update MP3 features for GStreamer 1.14.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>