From 23fac6a44aac792d8e2119ebde9942e3df2a0d77 Mon Sep 17 00:00:00 2001
From: "J. Patrick Avery, Jr" <patrick.avery@cns.doe.gov>
Date: Wed, 3 Jun 2015 20:06:11 -0400
Subject: [PATCH] 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
---
 bin/install-category | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/install-category b/bin/install-category
index 6771d7c..c769719 100755
--- a/bin/install-category
+++ b/bin/install-category
@@ -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