diff options
Diffstat (limited to 'openwrt/package/lighttpd/Makefile')
| -rw-r--r-- | openwrt/package/lighttpd/Makefile | 77 |
1 files changed, 49 insertions, 28 deletions
diff --git a/openwrt/package/lighttpd/Makefile b/openwrt/package/lighttpd/Makefile index c047b7a661..b5a4e3dd9c 100644 --- a/openwrt/package/lighttpd/Makefile +++ b/openwrt/package/lighttpd/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.4.4 PKG_RELEASE:=1 -PKG_MD5SUM:=c26eea734490129a45e465ac0f327e4a +PKG_MD5SUM:=0142f34549cf326d1ee3631be665482f PKG_SOURCE_URL:=http://www.lighttpd.net/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -19,8 +19,8 @@ include $(TOPDIR)/package/rules.mk define PKG_mod_template $$(IPKG_$(1)): - install -d -m0755 $$(IDIR_$(1))/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/mod_$(2).so $$(IDIR_$(1))/usr/lib/ + install -d -m0755 $$(IDIR_$(1))/usr/lib/lighttpd + install -m0755 $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$(2).so $$(IDIR_$(1))/usr/lib/lighttpd/ $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) @@ -30,24 +30,28 @@ $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC $(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi)) +$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_REDIRECT,redirect)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_REWRITE,rewrite)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SIMPLE_VHOST,simple_vhost)) +$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) @@ -55,32 +59,45 @@ $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ PCRE_LIB="-lpcre" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --with-openssl="$(STAGING_DIR)/usr" \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib/lighttpd \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc/lighttpd \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --without-attr \ + --without-bzip2 \ + --without-fam \ + --without-gdbm \ + --without-ldap \ + --without-lua \ + --without-memcache \ + --without-mysql \ + --with-openssl="$(STAGING_DIR)/usr" \ + --with-pcre \ + --without-valgrind \ + --without-webdav-props \ ) touch $@ @@ -99,6 +116,10 @@ $(IPKG_LIGHTTPD): install -m0644 ./files/lighttpd.default $(IDIR_LIGHTTPD)/etc/default/lighttpd install -m0755 -d $(IDIR_LIGHTTPD)/etc/init.d install -m0755 ./files/lighttpd.init $(IDIR_LIGHTTPD)/etc/init.d/lighttpd + install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd + for m in dirlisting indexfile staticfile; do \ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ + done install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ $(RSTRIP) $(IDIR_LIGHTTPD) |