diff --git a/Makefile b/Makefile index 0e7a5d049..ffa7c694e 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ folk/index.htm: noinfo/folk.csv noinfo/make-folklist.py ########### -surveytable: +surveytable: cd $(surveydir_path); perl tablize-csv.pl Surveys.csv; perl tablizebyname-csv.pl Surveys.csv @@ -42,7 +42,7 @@ surveytable: qmlists: smkridge/204/qm.html smkridge/204/qm.html: smkridge/204/qm.csv smkridge/204/tablize-qms.pl - cd smkridge/204/; tablize-qms.pl qm.csv + cd smkridge/204/; tablize-qms.pl qm.csv ########### @@ -67,27 +67,27 @@ tarfiles: noinfo/all.tgz smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz noinfo/all.tgz: noinfo/all.3d tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser -smkridge/204/surveydata.tgz: smkridge/204/204.3d +smkridge/204/surveydata.tgz: smkridge/204/204.3d tar $(tar_flags) smkridge/204/surveydata.tgz -C $(dataset_path)/caves/ 204 -smkridge/234/surveydata.tgz: smkridge/234/234.3d +smkridge/234/surveydata.tgz: smkridge/234/234.3d tar $(tar_flags) smkridge/234/surveydata.tgz -C $(dataset_path)/caves/ 234 -plateau/76/surveydata.tgz: plateau/76/76.3d +plateau/76/surveydata.tgz: plateau/76/76.3d tar $(tar_flags) plateau/76/surveydata.tgz -C $(dataset_path)/caves/ 76 -# (tarfiles depend on 3d files to avoid running the +# (tarfiles depend on 3d files to avoid running the # expensive $(shell ...) commands more than necessary.) ########### clean: cut -d "," -f 6 noinfo/CAVETAB2.CSV | xargs rm -f - -cut -d "," -f 6 noinfo/CAVETAB2.CSV | sed 's/[^\/]*$$//; s/"//g' | xargs -l rmdir --ignore-fail-on-non-empty > /dev/null 2>&1 + -cut -d "," -f 6 noinfo/CAVETAB2.CSV | sed 's/[^\/]*$$//; s/"//g' | xargs -l rmdir --ignore-fail-on-non-empty > /dev/null 2>&1 # remove empty directories - rm -f indxal.htm folk/index.htm noinfo/all.pos + rm -f indxal.htm folk/index.htm noinfo/all.pos rm -f noinfo/all.3d smkridge/204/204.3d smkridge/234/234.3d plateau/76/76.3d - rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz noinfo/all.tgz + rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz noinfo/all.tgz rm -f $(surveydir_path)/surveytable.html rm -f report.html