From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Mar 2014 16:26:05 +0000 (-0300)
Subject: Makefile cleanup
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ebb7769b363f8c3604f1ad20afd73677a638bbf5;p=puppet-bootstrap.git

Makefile cleanup
---

diff --git a/Makefile b/Makefile
index 90404ca..ff8aa0d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,9 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
-REPO = git://git.sarava.org/puppet-bootstrap.git
-CWD  = $(shell pwd)
+REPO   = git://git.sarava.org/puppet-bootstrap.git
+CWD    = $(shell pwd)
+PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules
 
 all: clean remote modules
 
@@ -36,10 +37,10 @@ remote:
 
 config:
 	$(EDITOR) hiera/bootstrap.yaml
-	FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/classes/configurator.pp
+	$(PUPPET) manifests/classes/configurator.pp
 
 apply:
-	FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/$(stage).pp
+	$(PUPPET) manifests/$(stage).pp
 
 clean:
 	rm -rf modules