equal
deleted
inserted
replaced
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 include ../../../make-rules/shared-macros.mk |
23 include ../../../make-rules/shared-macros.mk |
24 |
24 |
25 COMPONENT_NAME= puppet |
25 COMPONENT_NAME= puppet |
26 COMPONENT_VERSION= 3.6.2 |
26 COMPONENT_VERSION= 3.6.2 |
46 |
46 |
47 ../hiera/build/%/.installed: |
47 ../hiera/build/%/.installed: |
48 (cd ../hiera ; $(GMAKE) install) |
48 (cd ../hiera ; $(GMAKE) install) |
49 |
49 |
50 # set the bindir to /usr/sbin |
50 # set the bindir to /usr/sbin |
51 INSTALL_RB_BINDIR = $(USRSBINDIR) |
51 INSTALL_RB_BINDIR_OPTION = --bindir=$(USRSBINDIR) |
|
52 |
|
53 # --sbindir option not supported by Puppet install.rb |
|
54 INSTALL_RB_SBINDIR_OPTION = |
52 |
55 |
53 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
56 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
54 |
57 |
55 # pass Ruby values onto the package manfiest |
58 # pass Ruby values onto the package manfiest |
56 PKG_MACROS += RUBY_VERSION=$(RUBY_VERSION) |
59 PKG_MACROS += RUBY_VERSION=$(RUBY_VERSION) |