From 9a0c412be667c2b0b235ceef920ebd2df72c1d2f Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Thu, 27 Jun 2013 13:46:56 +0200 Subject: Add support for building a SLES rpm package --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b659836f..29bfe0bd 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f ) CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version) CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()") +ifeq ($(distro),) + distro = redhat +endif + all: test check_version pep8: @@ -25,7 +29,7 @@ test: check_version: @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \ echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \ - "not equal to code version $(CODE_VERSION)"; exit 2; \ + "not equal to code version $(CODE_VERSION)"; exit 2; \ else true; fi 2to3: @@ -37,9 +41,9 @@ clean: yaml: @$(CWD)/tools/validate-yaml.py $(YAML_FILES) - + rpm: - ./packages/brpm + ./packages/brpm --distro $(distro) deb: ./packages/bddeb -- cgit v1.2.3 From fe1e3197482a25365379be306741d0a943dcdfd5 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 17 Jul 2013 15:31:57 -0400 Subject: fix indentation a bit in Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 29bfe0bd..8cf1659a 100644 --- a/Makefile +++ b/Makefile @@ -28,9 +28,9 @@ test: check_version: @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \ - echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \ - "not equal to code version $(CODE_VERSION)"; exit 2; \ - else true; fi + echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \ + "not equal to code version $(CODE_VERSION)"; exit 2; \ + else true; fi 2to3: 2to3 $(PY_FILES) -- cgit v1.2.3