components/puppet/Makefile
branchs11-update
changeset 3401 bd976a0fa74e
parent 2928 43b3da52b84a
--- a/components/puppet/Makefile	Fri Oct 17 07:49:41 2014 -0700
+++ b/components/puppet/Makefile	Fri Oct 17 09:32:29 2014 -0700
@@ -37,10 +37,10 @@
 include $(WS_TOP)/make-rules/ips.mk
 
 # puppet requires facter to build
-COMPONENT_INSTALL_ENV	+= RUBYLIB="$(COMPONENT_DIR)/../facter/build/prototype/$(MACH)$(VENDOR_RUBY)"
+COMPONENT_INSTALL_ENV	+= RUBYLIB="$(COMPONENT_DIR)/../ruby/facter/build/prototype/$(MACH)$(VENDOR_RUBY)"
 
-../facter/build/%/.installed:
-	(cd ../facter ; $(GMAKE) install)
+../ruby/facter/build/%/.installed:
+	(cd ../ruby/facter ; $(GMAKE) install)
 
 # set the bindir to /usr/sbin
 INSTALL_RB_BINDIR =	$(USRSBINDIR)
@@ -57,7 +57,7 @@
 	(cd ext; $(RUBY) extconf.rb; $(GMAKE))
 
 # make sure facter is installed first
-install:	../facter/build/$(MACH64)/.installed $(INSTALL_64)
+install:	../ruby/facter/build/$(MACH64)/.installed $(INSTALL_64)
 
 clean::
 	@if [ -f ext/Makefile ]; then \