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>
Reduced to upower 0.99.10 by Tobias Geerinckx-Rice <me@tobias.gr>

--- 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
@@ -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
 

<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>refs</a><a class='active' href='/guix/log/gnu/image.scm'>log</a><a href='/guix/tree/gnu/image.scm?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>tree</a><a href='/guix/commit/gnu/image.scm?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>commit</a><a href='/guix/diff/gnu/image.scm?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/image.scm'>
<input type='hidden' name='id' value='66071cd85ea323292eb60258d3cef9ffaf8306d4'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</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=66071cd85ea323292eb60258d3cef9ffaf8306d4'>root</a>/<a href='/guix/log/gnu?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>gnu</a>/<a href='/guix/log/gnu/image.scm?id=66071cd85ea323292eb60258d3cef9ffaf8306d4'>image.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/image.scm?id=66071cd85ea323292eb60258d3cef9ffaf8306d4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-17 10:55:36 +0100'>2021-02-17</span></td><td><a href='/guix/commit/gnu/image.scm?id=4cce7610eb992fcf168be7cb05ec2b1b2020171e'>image: Export image? procedure.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-09-30 10:47:59 +0200'>2020-09-30</span></td><td><a href='/guix/commit/gnu/image.scm?id=99d036ce8402326352c8aa181d89c6d0c7ce85a8'>image: Add image-type support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-06-24 20:24:34 +0200'>2020-06-24</span></td><td><a href='/guix/commit/gnu/image.scm?id=b904b59ce592c89dfb4675a8c06757afed6738a0'>image: Move hurd image definition to a dedicated file.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-06-13 15:20:52 +0200'>2020-06-13</span></td><td><a href='/guix/commit/gnu/image.scm?id=f292d4719dead6a615187f325fbc0bb0e99d10b4'>image: Add 'target' support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-05-26 17:16:42 +0200'>2020-05-26</span></td><td><a href='/guix/commit/gnu/image.scm?id=bd3716f6fee127562935d86ff7f641197366769c'>image: Add partition file-system options support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-05-26 13:06:37 +0200'>2020-05-26</span></td><td><a href='/guix/commit/gnu/image.scm?id=1dd7b87f101ce99b37be5c769904c1aa2f6a0615'>image: Set offset default to zero.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-05-26 09:57:06 +0200'>2020-05-26</span></td><td><a href='/guix/commit/gnu/image.scm?id=1b4fa7851b39f087a6433e8b5e22c479ca1da289'>image: Add partition offset support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-05-05 16:13:53 +0200'>2020-05-05</span></td><td><a href='/guix/commit/gnu/image.scm?id=f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa'>image: Add a new API.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>