From f72114c657bb663c046441f5134694435f9a520d Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 21 Apr 2012 11:56:06 -0400 Subject: Move setup.py stuff back to top level as "make sdist" was not working, plus, it makes sources cleaner. --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dae28e5b9b..72e9608df4 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,6 @@ RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1) RPMDIST = $(shell rpm --eval '%dist') RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)" -# Python distutils options -DUDIR = packaging/distutils -DUSETUP = $(DUDIR)/setup.py -DUMANIFEST = $(DUDIR)/MANIFEST.in - all: clean python @@ -70,15 +65,15 @@ clean: rm -rf MANIFEST rpm-build python: - python $(DUSETUP) build + python setup.py build install: mkdir -p /usr/share/ansible cp ./library/* /usr/share/ansible/ - python $(DUSETUP) install + python setup.py install sdist: clean - python ./$(DUSETUP) sdist -t $(DUMANIFEST) + python setup.py sdist -t MANIFEST.in rpmcommon: sdist @mkdir -p rpm-build @@ -109,3 +104,10 @@ rpm: rpmcommon @echo "Ansible RPM is built:" @echo " rpm-build/noarch/$(RPMNVR).noarch.rpm" @echo "#############################################" + +debian: + # stub target, FIXME! + (cd packaging/debian; dpkg-buildpackage -us -uc -rfakeroot) + +# for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory + -- cgit v1.2.3