equal
deleted
inserted
replaced
99 LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ |
99 LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ |
100 -R$(APU-CONFIG-RPATH.$(BITS)) |
100 -R$(APU-CONFIG-RPATH.$(BITS)) |
101 |
101 |
102 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" |
102 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" |
103 |
103 |
104 # Current version of subversion only supports ruby 1.8, not 1.9. |
|
105 # Until subversion is updated to 1.8.0 (ruby 1.9 support added) |
|
106 # or later, use ruby 1.8. |
|
107 CONFIGURE_ENV += RUBY="$(RUBY.1.8)" |
|
108 |
|
109 # Let's make noise just because we have to override --libdir |
104 # Let's make noise just because we have to override --libdir |
110 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
105 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
111 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
106 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
112 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |
107 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |
113 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS)) |
108 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS)) |