Skip to content

Commit

Permalink
honour html5 flag
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@14587 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Dec 23, 2016
1 parent 8a80368 commit 86ea5f3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ def add_gui_exe(*args):
add_data_files('etc/xpra', glob.glob("etc/xpra/nvenc*.keys"))
add_data_files('etc/xpra/conf.d', glob.glob("etc/xpra/conf.d/*conf"))
#build minified html5 client in temporary build dir:
if "clean" not in sys.argv:
if "clean" not in sys.argv and html5_ENABLED:
install_html5("build/www")
for k,v in glob_recurse("build/www").items():
if (k!=""):
Expand Down Expand Up @@ -1819,7 +1819,8 @@ def run(self):
class install_data_override(install_data):
def run(self):
print("install_data_override: install_dir=%s" % self.install_dir)
install_html5(os.path.join(self.install_dir, "share/xpra/www"))
if html5_ENABLED:
install_html5(os.path.join(self.install_dir, "share/xpra/www"))
install_data.run(self)

etc_prefix = self.install_dir
Expand Down

0 comments on commit 86ea5f3

Please sign in to comment.