mirror of https://github.com/dirtbags/moth.git
install-category: fix for puzzles with Makefiles
- simplify outdir - when running a Makefile in a puzzle, don't pass $(pwd) as a component of DESTDIR -- $tgt is an absolute path. Fixes: proto and others
This commit is contained in:
parent
c44d6de23b
commit
c6f218854a
|
@ -73,7 +73,7 @@ EOF
|
|||
}
|
||||
|
||||
cat=$(basename $indir)
|
||||
outdir=$(dirname $0)/../packages/$cat
|
||||
outdir=$(dirname $(dirname $0))/packages/$cat
|
||||
uanswers=$outdir/answers.unsorted
|
||||
usummary=$outdir/summary.unsorted
|
||||
umap=$outdir/map.unsorted
|
||||
|
@ -100,7 +100,7 @@ for dn in $indir/[0-9]*; do
|
|||
|
||||
if [ -f $dn/Makefile ]; then
|
||||
# If there's a Makefile, run make
|
||||
make DESTDIR=$(pwd)/$tgt -C $dn || exit 1
|
||||
make DESTDIR=$tgt -C $dn || exit 1
|
||||
files=$(ls -1 $tgt | grep -v index.html || true)
|
||||
elif [ -f $dn/00manifest.txt ]; then
|
||||
# If there's a manifest, use that
|
||||
|
|
Loading…
Reference in New Issue