From 6e57936e95d4490fa4d2ae4e97251565e9df98a8 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Tue, 12 Feb 2019 20:32:07 -0500 Subject: [PATCH] stop blocking py3 builder plugins in Makefile --- plugins/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 0d97881c..3d352b3c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -34,13 +34,11 @@ install: $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(HUBPLUGINDIR)', 1, '$(HUBPLUGINDIR)', 1)"; \ mkdir -p $(DESTDIR)/$(HUBCONFDIR); \ install -p -m 644 $(HUBCONFFILES) $(DESTDIR)/$(HUBCONFDIR); \ - if [ "$(PYMAJORVER)" == "2" ] ; then \ - mkdir -p $(DESTDIR)/$(BUILDERPLUGINDIR); \ - install -p -m 644 $(BUILDERFILES) $(DESTDIR)/$(BUILDERPLUGINDIR); \ - $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(BUILDERPLUGINDIR)', 1, '$(BUILDERPLUGINDIR)', 1)"; \ - mkdir -p $(DESTDIR)/$(BUILDERCONFDIR); \ - install -p -m 644 $(BUILDERCONFFILES) $(DESTDIR)/$(BUILDERCONFDIR); \ - fi + mkdir -p $(DESTDIR)/$(BUILDERPLUGINDIR); \ + install -p -m 644 $(BUILDERFILES) $(DESTDIR)/$(BUILDERPLUGINDIR); \ + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(BUILDERPLUGINDIR)', 1, '$(BUILDERPLUGINDIR)', 1)"; \ + mkdir -p $(DESTDIR)/$(BUILDERCONFDIR); \ + install -p -m 644 $(BUILDERCONFFILES) $(DESTDIR)/$(BUILDERCONFDIR); \ mkdir -p $(DESTDIR)/$(CLIPLUGINDIR) install -p -m 644 $(CLIFILES) $(DESTDIR)/$(CLIPLUGINDIR)