--- a/components/puppet/Makefile Thu Sep 04 13:24:25 2014 -0700
+++ b/components/puppet/Makefile Thu Sep 04 16:55:58 2014 -0600
@@ -39,10 +39,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)
@@ -59,7 +59,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 \