equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 include ../../make-rules/shared-macros.mk |
26 include ../../make-rules/shared-macros.mk |
27 |
27 |
28 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
28 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
88 CONFIGURE_ENV += PYMODS="$(PYMODS)" |
88 CONFIGURE_ENV += PYMODS="$(PYMODS)" |
89 CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)" |
89 CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)" |
90 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" |
90 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" |
91 CONFIGURE_ENV += PERL="$(PERL)" |
91 CONFIGURE_ENV += PERL="$(PERL)" |
92 CONFIGURE_ENV += PLMODS="$(PLMODS)" |
92 CONFIGURE_ENV += PLMODS="$(PLMODS)" |
93 # Current version of subversion only supports ruby 1.8, not 1.9. |
|
94 # Until subversion is updated to 1.8.0 (ruby 1.9 support added) |
|
95 # or later, use ruby 1.8. |
|
96 CONFIGURE_ENV += RUBY="$(RUBY.1.8)" |
|
97 |
93 |
98 # Let's make noise just because we have to override --libdir |
94 # Let's make noise just because we have to override --libdir |
99 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
95 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
100 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
96 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
101 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |
97 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |