Skip to content

Commit 8601668

Browse files
committed
builder: Put index file into builder/templates directory.
We're not sure yet how we will build the website going forward, but putting this into website/ was always wrong (we never used it), so just build it in the local directory for now.
1 parent da99efc commit 8601668

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

builder/templates/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ EXTRA_DIST = \
2828
ubuntu.preseed \
2929
validate.sh
3030

31-
# Create the index file under the top level website/ directory.
32-
noinst_DATA = $(top_builddir)/website/download/builder/index
31+
# Create the index file.
32+
noinst_DATA = index
3333

34-
$(top_builddir)/website/download/builder/index: $(index_fragments)
34+
index: $(index_fragments)
3535
rm -f $@ $@-t
3636
LANG=C sh -c 'cat *.index-fragment' > $@-t
3737
mv $@-t $@

builder/templates/validate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ fn=test-filename-for-index-validate
2424
rm -f $fn
2525
touch $fn
2626

27-
$VG virt-index-validate "$top_srcdir/website/download/builder/index"
28-
$VG virt-index-validate "$top_srcdir/website/download/builder/index.asc"
27+
$VG virt-index-validate index
28+
test -f index.asc && $VG virt-index-validate index.asc
2929
$VG virt-index-validate $fn
3030

3131
rm $fn

0 commit comments

Comments
 (0)