98e7759054399cd537317fbbc4338974063df3de braney Sat Oct 5 07:49:32 2019 -0700 try this again... remove all the files we're copying into place diff --git src/hg/pyLib/makefile src/hg/pyLib/makefile index 3a58dbe..769b5a8 100644 --- src/hg/pyLib/makefile +++ src/hg/pyLib/makefile @@ -1,46 +1,46 @@ kentSrc = ../.. include ../../inc/common.mk #cannot use common include rules, don't know how to overwrite :: targets #include ../../inc/cgi_build_rules.mk ifeq (${CGI_BIN_USER},) CGI_BIN_USER=${CGI_BIN}-${USER} endif ifeq (${CGI_BIN_BETA},) CGI_BIN_BETA=${CGI_BIN}-beta endif my:: compile mkdir -p ${CGI_BIN_USER}/pyLib/ - rm -f ${CGI_BIN_USER}/pyLib/hgLib.{py,pyc,pyo} + rm -f ${CGI_BIN_USER}/pyLib/{hgLib.{py,pyc,pyo},six.*} cp -p hgLib.py ${CGI_BIN_USER}/pyLib/hgLib.py cp -p hgLib.pyo ${CGI_BIN_USER}/pyLib/hgLib.pyo cp -p six.* ${CGI_BIN_USER}/pyLib/ beta:: compile mkdir -p ${CGI_BIN_BETA}/pyLib/ - rm -f ${CGI_BIN_BETA}/pyLib/hgLib.{py,pyc,pyo} + rm -f ${CGI_BIN_BETA}/pyLib/{hgLib.{py,pyc,pyo},six.*} cp -p hgLib.py ${CGI_BIN_BETA}/pyLib/hgLib.py cp -p hgLib.pyo ${CGI_BIN_BETA}/pyLib/hgLib.pyo cp -p six.* ${CGI_BIN_BETA}/pyLib/ alpha:: compile mkdir -p ${CGI_BIN}/pyLib/ - rm -f ${CGI_BIN}/pyLib/hgLib.{py,pyc,pyo} + rm -f ${CGI_BIN}/pyLib/{hgLib.{py,pyc,pyo},six.*} cp -p hgLib.py ${CGI_BIN}/pyLib/hgLib.py cp -p hgLib.pyo ${CGI_BIN}/pyLib/hgLib.pyo cp -p six.* ${CGI_BIN}/pyLib/ compile: # byte-compile and strip all python source code to .pyo files python2.7 -OO -m compileall ./ clean:: rm -f *.pyc *.pyo lint:: pylint -E hgLib.py install::