From c70a2873f8a4447f8b38ad7b8468fc78c91bbb63 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Thu, 20 Oct 2016 15:27:44 +0200 Subject: Build: replace ipaplatform magic with symlinks generated by configure The original approach with __path__ implemented by 8f98fa1bd5f1da207fab6f89b75e0cdc19d00797 broke Pylint: We decided to resort back to symlinks as it is easiest solution which does not break pylint in weird ways. This commit introduces configure --with-ipaplatform option. https://fedorahosted.org/freeipa/ticket/6418 Reviewed-By: Lukas Slebodnik Reviewed-By: Stanislav Laznicka Reviewed-By: Christian Heimes --- Makefile | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b7fdc4b1..761b57ddc 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,6 @@ PRJ_PREFIX=freeipa RPMBUILD ?= $(PWD)/rpmbuild TARGET ?= master -SUPPORTED_PLATFORM ?= fedora - IPA_NUM_VERSION ?= $(shell printf %d%02d%02d $(IPA_VERSION_MAJOR) $(IPA_VERSION_MINOR) $(IPA_VERSION_RELEASE)) # After updating the version in VERSION you should run the version-update @@ -167,13 +165,6 @@ ipapython/version.py: ipapython/version.py.in FORCE ipasetup.py: ipasetup.py.in FORCE sed -e s/__VERSION__/$(IPA_VERSION)/ $< > $@ -ipaplatform/__init__.py: ipaplatform/__init__.py.in FORCE - if [ "$(SUPPORTED_PLATFORM)" != "" ]; then \ - sed -e s/__PLATFORM__/$(SUPPORTED_PLATFORM)/ \ - $< > $@; \ - rm -f ipaplatform/constants.py ipaplatform/paths.py ipaplatform/services.py ipaplatform/tasks.py ; \ - fi - .PHONY: egg_info egg_info: ipapython/version.py ipaplatform/__init__.py ipasetup.py for directory in $(PYPKGDIRS); do \ -- cgit