eb95ad086950af2117fe4437ea6cac56d578a8cc ceisenhart Thu Oct 22 12:26:15 2015 -0700 Changing the makefile produced to not be cluster dependent. Refs #16156 diff --git src/utils/newPythonProg/newPythonProg.c src/utils/newPythonProg/newPythonProg.c index 5d5266e..cde87f0 100644 --- src/utils/newPythonProg/newPythonProg.c +++ src/utils/newPythonProg/newPythonProg.c @@ -34,31 +34,31 @@ upLevel = cloneString(".."); else if (fileExists("../../inc/common.mk")) upLevel = cloneString("../.."); else if (fileExists("../../../inc/common.mk")) upLevel = cloneString("../../.."); else if (fileExists("../../../../inc/common.mk")) upLevel = cloneString("../../../.."); else if (fileExists("../../../../../inc/common.mk")) upLevel = cloneString("../../../../.."); else { warn("WARNING: can not find inc/common.mk 1 to 4 directories up, fix the makefile"); upLevel = cloneString("../../../../.."); } fprintf(f, -"normal::\n\t cp -p %s /cluster/home/${USER}/bin\n\t cp -p %s /cluster/home/${USER}/kent/src/pyLib/scripts\n" +"normal::\n\t cp -p %s ${HOME}/bin\n\t cp -p %s ${HOME}/kent/src/pyLib/scripts\n" "test::\n\t@if test -d tests -a -s tests/makefile; then (cd tests && ${MAKE} test); \\ " "\n\telse echo \"# no tests directory (or perhaps no tests/makefile) in $(CURDIR)\"; fi" , progName, progName); fclose(f); } void writeProgram(char *fileName, char *programName, char *usage) { FILE *programFile = mustOpen(fileName, "w"); // Write the python skeleton fprintf(programFile, "#!/usr/bin/env python2.7\n# %s\n\"\"\"%s\"\"\"\n", programName, usage); fprintf(programFile, "import os\nimport sys\nimport collections\nimport argparse\n" "\n"