summaryrefslogtreecommitdiffstats
path: root/openwrt/package/lighttpd
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-01 11:29:52 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-01 11:29:52 +0000
commitf57822c4de3d8f4d0bf47a26e67c13beff3b8161 (patch)
treede1fa787c0db778fb503facb63b7fa478ec28e22 /openwrt/package/lighttpd
parentb54d6b49ab461c1e9c732b2b2974c9803f1b5bc4 (diff)
remove intrusive patch and find-a-better-way-to-do-it (tm)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3720 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/lighttpd')
-rw-r--r--openwrt/package/lighttpd/Makefile3
-rw-r--r--openwrt/package/lighttpd/patches/501-libxml2_includes.patch12
2 files changed, 1 insertions, 14 deletions
diff --git a/openwrt/package/lighttpd/Makefile b/openwrt/package/lighttpd/Makefile
index 5b53d33a1..d0a88a65a 100644
--- a/openwrt/package/lighttpd/Makefile
+++ b/openwrt/package/lighttpd/Makefile
@@ -65,7 +65,7 @@ $(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 -I$(STAGING_DIR)/include" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2 -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" \
@@ -111,7 +111,6 @@ $(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
- STAGING_DIR=$(STAGING_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
touch $@
diff --git a/openwrt/package/lighttpd/patches/501-libxml2_includes.patch b/openwrt/package/lighttpd/patches/501-libxml2_includes.patch
deleted file mode 100644
index 4b7943d9d..000000000
--- a/openwrt/package/lighttpd/patches/501-libxml2_includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN lighttpd-1.4.11/src/Makefile.in lighttpd-1.4.11.new/src/Makefile.in
---- lighttpd-1.4.11/src/Makefile.in 2006-03-07 13:21:02.000000000 +0100
-+++ lighttpd-1.4.11.new/src/Makefile.in 2006-04-17 00:16:12.000000000 +0200
-@@ -409,7 +409,7 @@
- STRIP = @STRIP@
- U = @U@
- VERSION = @VERSION@
--XML_CFLAGS = @XML_CFLAGS@
-+XML_CFLAGS = -I$(STAGING_DIR)/usr/include/libxml2
- XML_LIBS = @XML_LIBS@
- Z_LIB = @Z_LIB@
- ac_ct_AR = @ac_ct_AR@