equal
deleted
inserted
replaced
43 include $(WS_MAKE_RULES)/install.rb.mk |
43 include $(WS_MAKE_RULES)/install.rb.mk |
44 include $(WS_MAKE_RULES)/ips.mk |
44 include $(WS_MAKE_RULES)/ips.mk |
45 include $(WS_MAKE_RULES)/ruby.mk |
45 include $(WS_MAKE_RULES)/ruby.mk |
46 |
46 |
47 # puppet requires facter and hiera as part of the install phase |
47 # puppet requires facter and hiera as part of the install phase |
48 FACTER_LIB=$(WS_TOP)/components/ruby/facter/build/$(MACH64)/lib |
48 FACTER_LIB=$(WS_TOP)/components/ruby/facter/build/$(MACH)/lib |
49 HIERA_LIB=$(WS_TOP)/components/ruby/hiera/build/$(MACH64)/lib |
49 HIERA_LIB=$(WS_TOP)/components/ruby/hiera/build/$(MACH)/lib |
50 COMPONENT_INSTALL_ENV += RUBYLIB="$(FACTER_LIB):$(HIERA_LIB)" |
50 COMPONENT_INSTALL_ENV += RUBYLIB="$(FACTER_LIB):$(HIERA_LIB)" |
51 |
51 |
52 ../facter/build/%/.installed: |
52 ../facter/build/%/.installed: |
53 (cd ../facter ; $(GMAKE) install) |
53 (cd ../facter ; $(GMAKE) install) |
54 |
54 |