build: simplify gana update script

1 files changed, 18 insertions, 25 deletions

diff --git a/scripts/gana_update.sh b/scripts/gana_update.sh
index 0707433f5..0f2d17509 100755
--- a/scripts/gana_update.sh
+++ b/scripts/gana_update.sh
@@ -13,42 +13,35 @@ gana_update()
     fi
     echo "Updating GANA..."
     if existence recfmt; then
-      cwd=$PWD
+      GNUNET_SRC_ROOT=$PWD
       cd contrib/gana || exit 1
       # GNS
       echo "Updating GNS record types"
-      cd gnu-name-system-record-types && \
-         make >/dev/null && \
-         cp gnu_name_system_record_types.h ../../../src/include/ || exit 1
+      make -C gnu-name-system-record-types >/dev/null && \
+         cp gnu-name-system-record-types/gnu_name_system_record_types.h $GNUNET_SRC_ROOT/src/include/ || exit 1
       echo "Creating default TLDs"
-      cd ../gnu-name-system-default-tlds && \
-         make >/dev/null && \
-         cp tlds.conf ../../../src/service/gns || exit 1
+      make -C gnu-name-system-default-tlds >/dev/null && \
+         cp gnu-name-system-default-tlds/tlds.conf $GNUNET_SRC_ROOT/src/service/gns || exit 1
       echo "Creating default GNS protocol numbers"
-      cd ../gns-protocol-numbers && \
-         make >/dev/null && \
-         cp gnu_name_system_protocols.h ../../../src/include/ || exit 1
-      echo "Creating default GNS service port nummbers"
-      cd ../gns-service-port-numbers && \
-         make >/dev/null && \
-         cp gnu_name_system_service_ports.h ../../../src/include/ || exit 1
+      make -C gns-protocol-numbers >/dev/null && \
+         cp gns-protocol-numbers/gnu_name_system_protocols.h $GNUNET_SRC_ROOT/src/include/ || exit 1
+      echo "Creating default GNS service port numbers"
+      make -C gns-service-port-numbers >/dev/null && \
+         cp gns-service-port-numbers/gnu_name_system_service_ports.h $GNUNET_SRC_ROOT/src/include/ || exit 1
 
       # Signatures
       echo "Updating GNUnet signatures"
-      cd ../gnunet-signatures && \
-         make >/dev/null && \
-         cp gnunet_signatures.h ../../../src/include || exit 1
+      make -C gnunet-signatures >/dev/null && \
+         cp gnunet-signatures/gnunet_signatures.h $GNUNET_SRC_ROOT/src/include || exit 1
       # DHT Block Types
       echo "Updating DHT record types"
-      cd ../gnunet-dht-block-types && \
-         make >/dev/null && \
-         cp gnunet_dht_block_types.h ../../../src/include || exit 1
+      make -C gnunet-dht-block-types >/dev/null && \
+         cp gnunet-dht-block-types/gnunet_dht_block_types.h $GNUNET_SRC_ROOT/src/include || exit 1
       echo "Generating GNUnet error types"
-      cd ../gnunet-error-codes && \
-         make >/dev/null && \
-         cp gnunet_error_codes.h ../../../src/include && \
-         cp gnunet_error_codes.c ../../../src/lib/util || exit 1
-      cd $cwd
+      make -C gnunet-error-codes >/dev/null && \
+         cp gnunet-error-codes/gnunet_error_codes.h $GNUNET_SRC_ROOT/src/include && \
+         cp gnunet-error-codes/gnunet_error_codes.c $GNUNET_SRC_ROOT/src/lib/util || exit 1
+      cd $GNUNET_SRC_ROOT
     else
       echo "ERROR: No recutils found! Unable to generate recent GANA headers and configs."
       exit 1