makedist: make lua54dir an explicit requirement

3 files changed, 15 insertions, 6 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7b722abe..63391324 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,7 +79,7 @@ jobs:
     - name: Smoke Test
       run: |
         ./configure
-        ./makedist dev
+        ./makedist dev $(dirname $(dirname $(which lua)))
         ./smoke_test.sh luarocks-dev.tar.gz
 
   ##############################################################################
@@ -95,6 +95,6 @@ jobs:
     - name: Binary Build Smoke Test
       run: |
         ./configure
-        ./makedist dev
+        ./makedist dev $(dirname $(dirname $(which lua)))
         ./smoke_test.sh luarocks-dev.tar.gz binary
 
diff --git a/makedist b/makedist
index 0cc247d3..77899d51 100755
--- a/makedist
+++ b/makedist
@@ -2,7 +2,7 @@
 
 if ! [ "$1" ]
 then
-   echo "usage: $0 <version>"
+   echo "usage: $0 <version> <lua54dir>"
    exit 1
 fi
 
@@ -17,6 +17,15 @@ make clean || exit 1
 version=$1
 shift
 
+lua54dir=$1
+shift
+
+if ! [ -d "$lua54dir" ]
+then
+   echo "Second argument must be the Lua 5.4 prefix."
+   exit 1
+fi
+
 #-------------------------------------------------------------------------------
 if ! [ "$version" = "dev" ]
 then
@@ -150,7 +159,7 @@ if [ "$1" = "binary" ]
 then
    shift
 
-   ./configure --lua-version=5.4
+   ./configure --lua-version=5.4 --with-lua=$lua54dir
 
    make binary
    cd build-binary
diff --git a/publishrelease b/publishrelease
index 37145092..f11218ec 100755
--- a/publishrelease
+++ b/publishrelease
@@ -5,7 +5,7 @@
    echo "example...: $0 3.1.1"
    echo
    echo "Before running this, make sure the packages were built:"
-   echo "   makedist 3.1.1 binary sign"
+   echo "   makedist 3.1.1 /opt/lua54/ binary sign"
    echo "And the tag was merged:"
    echo "   mergerelease 3.1.1"
    echo
@@ -55,7 +55,7 @@ function confirm() {
    echo "****************************************"
    git status
    echo "****************************************"
-   
+
    echo "Everything looks all right? (y/n)"
    echo "(Answering y will commit and push)"
    read