components/subversion/Makefile
changeset 5172 2ac937ed383b
parent 5125 34cc580c62c2
child 5454 1efad1afb469
equal deleted inserted replaced
5171:4e8b3c0ea78c 5172:2ac937ed383b
    96 
    96 
    97 COMPONENT_BUILD_TARGETS = all swig-py swig-pl javahl
    97 COMPONENT_BUILD_TARGETS = all swig-py swig-pl javahl
    98 COMPONENT_INSTALL_TARGETS = install install-lib \
    98 COMPONENT_INSTALL_TARGETS = install install-lib \
    99 			    install-swig-pl install-swig-py \
    99 			    install-swig-pl install-swig-py \
   100 			    install-javahl install-javahl-lib \
   100 			    install-javahl install-javahl-lib \
   101 			    install-mods-shared \
       
   102 			    install-bin install-docs
   101 			    install-bin install-docs
       
   102 
       
   103 $(BUILD_DIR)/$(MACH64)/.installed: COMPONENT_INSTALL_TARGETS += install-mods-shared
   103 
   104 
   104 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
   105 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
   105 CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
   106 CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
   106 CONFIGURE_ENV += PYTHON="$(PYTHON.$(BITS))"
   107 CONFIGURE_ENV += PYTHON="$(PYTHON.$(BITS))"
   107 CONFIGURE_ENV += PYMODS="$(PYMODS)"
   108 CONFIGURE_ENV += PYMODS="$(PYMODS)"
   116 
   117 
   117 APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config
   118 APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config
   118 APR-CONFIG.64 = /usr/apr/$(APR_VERSION)/bin/$(MACH64)/apr-1-config
   119 APR-CONFIG.64 = /usr/apr/$(APR_VERSION)/bin/$(MACH64)/apr-1-config
   119 APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config
   120 APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config
   120 APU-CONFIG.64 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/$(MACH64)/apu-1-config
   121 APU-CONFIG.64 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/$(MACH64)/apu-1-config
   121 APXS.32 = /usr/apache2/2.2/bin/apxs
   122 APXS.32 = no
   122 APXS.64 = /usr/apache2/2.4/bin/apxs
   123 APXS.64 = /usr/apache2/2.4/bin/apxs
   123 APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib
   124 APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib
   124 APR-CONFIG-RPATH.64 = /usr/apr/$(APR_VERSION)/lib/$(MACH64)
   125 APR-CONFIG-RPATH.64 = /usr/apr/$(APR_VERSION)/lib/$(MACH64)
   125 APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib
   126 APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib
   126 APU-CONFIG-RPATH.64 = /usr/apr-util/$(APR_VERSION)/lib/$(MACH64)
   127 APU-CONFIG-RPATH.64 = /usr/apr-util/$(APR_VERSION)/lib/$(MACH64)
   127 APACHE_LIBEXECDIR.32 = `$(APXS.32) -q libexecdir`
       
   128 APACHE_LIBEXECDIR.64 = `$(APXS.64) -q libexecdir`
       
   129 
   128 
   130 LDFLAGS += -R$(CONFIGURE_LIBDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \
   129 LDFLAGS += -R$(CONFIGURE_LIBDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \
   131 	   -R$(APU-CONFIG-RPATH.$(BITS))
   130 	   -R$(APU-CONFIG-RPATH.$(BITS))
   132 
   131 
   133 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
   132 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"