From baf00c0262e1b31393c440977f8c1d0653bf2b96 Mon Sep 17 00:00:00 2001
From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Sat, 4 Jun 2022 08:59:14 -0400
Subject: [PATCH] move "gana/" to caller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows for other prefix dirs to be used.

(domake): Consider $1 to be dir under ‘contrib/’.
(ensure): Likewise, for $2.
---
 contrib/gana-update.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/gana-update.sh b/contrib/gana-update.sh
index db122b9a3..04cdcef5b 100755
--- a/contrib/gana-update.sh
+++ b/contrib/gana-update.sh
@@ -5,8 +5,8 @@ set -eu
 
 domake ()
 {
-    # $1 -- dir under contrib/gana/
-    dir="contrib/gana/$1"
+    # $1 -- dir under contrib/
+    dir="contrib/$1"
 
     make -C $dir
 }
@@ -14,10 +14,10 @@ domake ()
 ensure ()
 {
     # $1 -- filename
-    # $2 -- src dir under contrib/gana/
+    # $2 -- src dir under contrib/
     # $3 -- dst dir under ./
     fn="$1"
-    src="contrib/gana/$2"
+    src="contrib/$2"
     dst="./$3"
 
     if ! diff $src/$fn $dst/$fn > /dev/null
@@ -26,9 +26,9 @@ ensure ()
     fi
 }
 
-domake                     gnu-taler-error-codes
-ensure taler_error_codes.c gnu-taler-error-codes src/util
-ensure taler_error_codes.h gnu-taler-error-codes src/include
+domake                     gana/gnu-taler-error-codes
+ensure taler_error_codes.c gana/gnu-taler-error-codes src/util
+ensure taler_error_codes.h gana/gnu-taler-error-codes src/include
 
-domake                  gnu-taler-db-events
-ensure taler_dbevents.h gnu-taler-db-events src/include
+domake                  gana/gnu-taler-db-events
+ensure taler_dbevents.h gana/gnu-taler-db-events src/include