Hi Michael, Le mercredi 5 août 2009 11:56:36, Michael Geddes a écrit : > Move apache (and apr) to a module-based distribution. Has a smaller > minimum footprint and allows more versatility.
Sorry for answering so late, your patch got unnoticed. Your patch looks good, however no longer applies. So if you don't mind resending it updated to current trunk, I will be glad to apply it. Please find inline a couple of comments. > > Signed-off-by: Michael Geddes <openwrt at frog dot wheelycreek dot net> > ----------- [snip] > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_asis.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_auth_basic/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_auth_basic.so > $(1)/usr/share/apache2/ +endef You obviously want to use a Makefile macro which creates the install rule based on what you pass it as parameters. See gstream-plugins or freeradius2 on howt to do this, as it saves both the number of Makefile lines written and the adding of new modules. > + > +define Package/apache-mod_auth_digest/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_auth_digest.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_authn/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authn_anon.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_authn_default.so $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authn_file.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_authn_db/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authn_dbd.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_authn_dbm.so $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_authz/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authz_default.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_authz_groupfile.so $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authz_host.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_authz_owner.so $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authz_user.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_authz_dbm/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_authz_dbm.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_autoindex/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_autoindex.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_cache/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_cache.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_cern_meta/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_cern_meta.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_cgi/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_cgi*.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_dav_fs/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_dav_fs.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_dav.so $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_dbd/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_dbd.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_deflate/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_deflate.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_dir/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_dir.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_dumpio/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_dumpio.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_env/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_env.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_expires/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_expires.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_ext_filter/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_ext_filter.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_file_cache/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_file_cache.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_filter/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_filter.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_headers/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_headers.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_ident/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_ident.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_imagemap/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_imagemap.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_include/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_include.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_info/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_info.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_log/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_log_config.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_log_forensic.so $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_logio.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_mem_cache/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_mem_cache.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_mime_magic/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_mime_magic.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_mime.so $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_negotiation/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_negotiation.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_proxy/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_proxy_connect.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_proxy_ftp.so $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_proxy_http.so > $(1)/usr/share/apache2/ + $(INSTALL_DATA) > $(PKG_INSTALL_DIR)/usr/lib/mod_proxy.so $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_proxy_balancer/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_proxy_balancer.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_proxy_ajp/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_proxy_ajp.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_rewrite/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_rewrite.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_setenvif/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_setenvif.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_speling/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_speling.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_ssl/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_ssl.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_status/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_status.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_unique_id/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_unique_id.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_userdir/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_userdir.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_usertrack/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_usertrack.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_version/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_version.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-mod_vhost_alias/install > + $(INSTALL_DIR) $(1)/usr/share/apache2/ > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/mod_vhost_alias.so > $(1)/usr/share/apache2/ +endef > + > +define Package/apache-server/postrm > rm -rf /usr/sbin/httpd > ln -s /bin/busybox /usr/sbin/httpd > echo -e "You may need to change your initscripts back for the use \n\ > @@ -158,8 +939,56 @@ > > define Package/apache-icons/install > $(INSTALL_DIR) $(1)/usr/share > - $(CP) $(PKG_INSTALL_DIR)/usr/share/icons $(1)/usr/share/ > + $(INSTALL_DIR) $(1)/usr/share/icons > + $(CP) $(PKG_INSTALL_DIR)/usr/share/icons/* $(1)/usr/share/icons > endef > > $(eval $(call BuildPackage,apache)) > +$(eval $(call BuildPackage,apache-server)) > $(eval $(call BuildPackage,apache-icons)) > +$(eval $(call BuildPackage,apache-mod_actions)) > +$(eval $(call BuildPackage,apache-mod_alias)) > +$(eval $(call BuildPackage,apache-mod_asis)) > +$(eval $(call BuildPackage,apache-mod_auth_basic)) > +$(eval $(call BuildPackage,apache-mod_auth_digest)) > +$(eval $(call BuildPackage,apache-mod_authn)) > +$(eval $(call BuildPackage,apache-mod_authn_db)) > +$(eval $(call BuildPackage,apache-mod_authz)) > +$(eval $(call BuildPackage,apache-mod_authz_dbm)) > +$(eval $(call BuildPackage,apache-mod_autoindex)) > +$(eval $(call BuildPackage,apache-mod_cache)) > +$(eval $(call BuildPackage,apache-mod_cern_meta)) > +$(eval $(call BuildPackage,apache-mod_cgi)) > +$(eval $(call BuildPackage,apache-mod_dav_fs)) > +$(eval $(call BuildPackage,apache-mod_dbd)) > +$(eval $(call BuildPackage,apache-mod_deflate)) > +$(eval $(call BuildPackage,apache-mod_dir)) > +$(eval $(call BuildPackage,apache-mod_dumpio)) > +$(eval $(call BuildPackage,apache-mod_env)) > +$(eval $(call BuildPackage,apache-mod_expires)) > +$(eval $(call BuildPackage,apache-mod_ext_filter)) > +$(eval $(call BuildPackage,apache-mod_file_cache)) > +$(eval $(call BuildPackage,apache-mod_filter)) > +$(eval $(call BuildPackage,apache-mod_headers)) > +$(eval $(call BuildPackage,apache-mod_ident)) > +$(eval $(call BuildPackage,apache-mod_imagemap)) > +$(eval $(call BuildPackage,apache-mod_include)) > +$(eval $(call BuildPackage,apache-mod_info)) > +$(eval $(call BuildPackage,apache-mod_log)) > +$(eval $(call BuildPackage,apache-mod_mem_cache)) > +$(eval $(call BuildPackage,apache-mod_mime_magic)) > +$(eval $(call BuildPackage,apache-mod_negotiation)) > +$(eval $(call BuildPackage,apache-mod_proxy)) > +$(eval $(call BuildPackage,apache-mod_proxy_balancer)) > +$(eval $(call BuildPackage,apache-mod_proxy_ajp)) > +$(eval $(call BuildPackage,apache-mod_rewrite)) > +$(eval $(call BuildPackage,apache-mod_setenvif)) > +$(eval $(call BuildPackage,apache-mod_speling)) > +$(eval $(call BuildPackage,apache-mod_ssl)) > +$(eval $(call BuildPackage,apache-mod_status)) > +$(eval $(call BuildPackage,apache-mod_unique_id)) > +$(eval $(call BuildPackage,apache-mod_userdir)) > +$(eval $(call BuildPackage,apache-mod_usertrack)) > +$(eval $(call BuildPackage,apache-mod_version)) > +$(eval $(call BuildPackage,apache-mod_vhost_alias)) > + > Index: libs/apr/Makefile > =================================================================== > --- libs/apr/Makefile (revision 17079) > +++ libs/apr/Makefile (working copy) > @@ -1,15 +1,16 @@ > # > -# Copyright (C) 2007-2009 OpenWrt.org > +# Copyright (C) 2007-2008 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > # > +# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $ > > include $(TOPDIR)/rules.mk > > PKG_NAME:=apr > PKG_VERSION:=1.2.9 > -PKG_RELEASE:=2 > +PKG_RELEASE:=1 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz > PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/ > @@ -29,43 +30,58 @@ > > TARGET_CFLAGS += $(FPIC) > CONFIGURE_ARGS += \ > - --with-devrandom=/dev/urandom \ > - --disable-dso > + --with-devrandom=/dev/urandom > > CONFIGURE_VARS += \ > apr_cv_process_shared_works=no \ > apr_cv_mutex_robust_shared=no \ > apr_cv_tcp_nodelay_with_cork=yes \ > - LDFLAGS="$$$$LDFLAGS -lpthread" \ > + LDFLAGS="$$$$LDFLAGS -lpthread" > > -define Build/Compile > +ifneq ($(CONFIG_PACKAGE_libapr),) > +define Build/Compile/libapr > + echo configuring APR Dynamic > + $(call Build/Configure/Default, \ > + --disable-static \ > + --enable-layout=GNU \ > + --enable-lfs \ > + --enable-ipv6 \ > + ) > + echo Building APR Dynamic > $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install > endef > +endif > > +define Build/Compile > + $(call Build/Compile/libapr) > +endef > + > +define Build/Configure > + echo NOT configuring APR > +endef > + > define Build/InstallDev > - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib > $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 - $(CP) > $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ > - $(1)/usr/bin/ > - $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ > - $(1)/usr/include/apr-1/ > - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \ > - $(1)/usr/lib/ > - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ > - $(1)/usr/lib/pkgconfig/ > - $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \ > - $(1)/usr/share/build-1/ > - $(SED) > 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' > $(1)/usr/bin/apr-1-config - $(SED) > 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR > )/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config - $(SED) > 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' > $(1)/usr/bin/apr-1-config - $(SED) > 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/inc > lude/,g' $(1)/usr/bin/apr-1-config - $(SED) 's,-L$$$$libdir,,g' > $(1)/usr/bin/apr-1-config > - $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config > + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib > $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 $(1)/usr/include/apache2 > + $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config* $(1)/usr/bin || true > + $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* > $(1)/usr/include/apr-1 || true + $(CP) > $(PKG_INSTALL_DIR)/usr/include/apache2/* $(1)/usr/include/apache2 || > true + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{apr-1,apr}.{la,a,so*} > $(1)/usr/lib || true + $(CP) > $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc $(1)/usr/lib/pkgconfig || > true + $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* > $(1)/usr/share/build-1 || true + for i in $(1)/usr/bin/apr-1-config* ; do > \ > + $(SED) > 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $$$$i; > \ + $(SED) > 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR > )/usr/share/build-1\",g' $$$$i ; \ + $(SED) > 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' > $$$$i ; \ + $(SED) > 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/inc > lude/,g' $$$$i ; \ + $(SED) 's,-L$$$$libdir,,g' $$$$i ; \ > + $(SED) 's,-R$$$$libdir,,g' $$$$i ; \ > + done > $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' > $(1)/usr/share/build-1/apr_rules.mk endef > > define Package/libapr/install > $(INSTALL_DIR) $(1)/usr/lib > - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/ > + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr.so.* $(1)/usr/lib/ > endef > > $(eval $(call BuildPackage,libapr)) > Index: libs/apr-util/Makefile > =================================================================== > --- libs/apr-util/Makefile (revision 17079) > +++ libs/apr-util/Makefile (working copy) > @@ -1,9 +1,10 @@ > # > -# Copyright (C) 2007-2009 OpenWrt.org > +# Copyright (C) 2007-2008 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > # > +# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $ > > include $(TOPDIR)/rules.mk > > @@ -42,18 +43,21 @@ > APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \ > > define Build/Compile > - $(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) > -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all + $(MAKE) -C > $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat > -liconv -lapr -luuid -lm -lcrypt" all $(MAKE) -C $(PKG_BUILD_DIR) > DESTDIR="$(PKG_INSTALL_DIR)" install endef > > define Build/InstallDev > $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib > $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \ > - $(1)/usr/bin/ > + $(1)/usr/bin > $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ > $(1)/usr/include/apr-1/ > - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ > + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,so*} \ > $(1)/usr/lib/ > + [ ! -e $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a ] \ > + || $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a \ > + $(1)/usr/lib/ > $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ > $(1)/usr/lib/pkgconfig/ > $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config > _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
