Makefile cleanup

diff --git a/Makefile b/Makefile
index 90404caaf82dd6f8859c35b42ec2a8f9f5cb8cce..ff8aa0d205c4bff2a411fee98f4c95f286017b8b 100644 (file)
--- 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