Merge branch 'luarocks-3'

1 files changed, 19 insertions, 4 deletions

diff --git a/makedist b/makedist
index fb41b981..5e22b688 100755
--- a/makedist
+++ b/makedist
@@ -20,9 +20,9 @@ grep -q "\"$1\"" rockspec || {
    exit 1
 }
 
-grep -q "program_version = \"$1\"" src/luarocks/cfg.lua || {
+grep -q "program_version = \"$1\"" src/luarocks/core/cfg.lua || {
    echo
-   echo "program_version in src/luarocks/cfg.lua is incorrect. Please fix it."
+   echo "program_version in src/luarocks/core/cfg.lua is incorrect. Please fix it."
    exit 1
 }
 
@@ -41,9 +41,9 @@ grep -q "LUAROCKS_VER: $1" appveyor.yml || {
 # e.g. if $1 is "2.3.0", $program_series is "2.3"
 program_series=${1%.*}
 
-grep -q "program_series = \"$program_series\"" src/luarocks/cfg.lua || {
+grep -q "program_series = \"$program_series\"" src/luarocks/core/cfg.lua || {
    echo
-   echo "program_series in src/luarocks/cfg.lua is incorrect. Please fix it."
+   echo "program_series in src/luarocks/core/cfg.lua is incorrect. Please fix it."
    exit 1
 }
 
@@ -80,6 +80,21 @@ then
    exit 1
 fi
 
+cat Makefile.setup.inc | tr ' \\' '\n\n' | grep 'lua$' | while read i
+do
+   if [ ! -e src/luarocks/$i ]
+   then
+      echo "Ref in Makefile.setup.inc for file that no longer exists: $i"
+      touch "outdated_ref"
+      exit 1
+   fi
+done
+if [ -e "outdated_ref" ]
+then
+   rm -f "outdated_ref"
+   exit 1
+fi
+
 rm -rf "release-unix" "release-windows" "$out.tar.gz" "$out-win32.zip"
 
 mkdir "release-unix"