Browse Source

lighttpd: fix build with pcre support

We need to tell where pcre-config is installed, now that STAGING_DIR/usr/bin
no longer is in the path.
Peter Korsgaard 15 years ago
parent
commit
519fed5f73
2 changed files with 2 additions and 2 deletions
  1. 1 1
      CHANGES
  2. 1 1
      package/lighttpd/lighttpd.mk

+ 1 - 1
CHANGES

@@ -20,7 +20,7 @@
 	dropbear, e2fsprogs, fbv, file, flex, fontconfig, gawk,
 	dropbear, e2fsprogs, fbv, file, flex, fontconfig, gawk,
 	gstreamer, gzip, intltool, ipsec-tools, iptables, libart,
 	gstreamer, gzip, intltool, ipsec-tools, iptables, libart,
 	libcgi, libdrm, libfuse, libgpg-error, libidn, liblockfile,
 	libcgi, libdrm, libfuse, libgpg-error, libidn, liblockfile,
-	libpng, links, linux-fusion, lmbench, lrzsz, make,
+	libpng, lighttpd, links, linux-fusion, lmbench, lrzsz, make,
 	module-init-tools, mysql_client, nbd, ncurses, neon, netcat,
 	module-init-tools, mysql_client, nbd, ncurses, neon, netcat,
 	netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
 	netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
 	sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
 	sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,

+ 1 - 1
package/lighttpd/lighttpd.mk

@@ -37,7 +37,7 @@ LIGHTTPD_CONF_OPT += --without-bzip2
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y)
 ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y)
-LIGHTTPD_CONF_ENV = PCRE_LIB="-lpcre"
+LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config
 LIGHTTPD_DEPENDENCIES += pcre
 LIGHTTPD_DEPENDENCIES += pcre
 LIGHTTPD_CONF_OPT += --with-pcre
 LIGHTTPD_CONF_OPT += --with-pcre
 else
 else