X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fapache%2FMakefile;h=b1a11062547ed2e1ec3b6865eb59f9b514a169c1;hb=a5179730868df0881a52cd26666ec245bb405971;hp=6ee88d4c16c13165535008e877887996cfec89d3;hpb=c3f10bb9e7e89977d5c6497455921e53961584ee;p=packages.git

diff --git a/net/apache/Makefile b/net/apache/Makefile
index 6ee88d4c1..b1a110625 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,23 +8,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apache
-PKG_VERSION:=2.2.14
-PKG_RELEASE:=1
+PKG_VERSION:=2.2.15
+PKG_RELEASE:=3
 PKG_SOURCE_NAME:=httpd
 
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ \
 		http://apache.imsam.info/httpd/
-PKG_MD5SUM:=a5226203aaf97e5b941c41a71c112704
+PKG_MD5SUM:=016cec97337eccead2aad6a7c27f2e14
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/apache/Default
   SECTION:=net
   CATEGORY:=Network
-  SUBMENU:=Web
+  SUBMENU:=Web Servers/Proxies
   TITLE:=The Apache Web Server
   URL:=http://httpd.apache.org/
 endef
@@ -37,7 +39,7 @@ endef
 
 define Package/apache
 $(call Package/apache/Default)
-  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl
+  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc
 endef
 
 define Package/apache/description
@@ -85,6 +87,9 @@ $(call Package/apache/Default/description)
  This package contains the icons from Apache.
 endef
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
@@ -100,32 +105,27 @@ define Build/Configure
 		--sysconfdir=/etc/apache \
 		ap_cv_void_ptr_lt_long=no \
 		logfiledir="/var/log" \
+		runtimedir="/var/run" \
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	rm -rf	$(PKG_INSTALL_DIR)/usr/man/ \
 		$(PKG_INSTALL_DIR)/usr/share/manual/
 	# if you need docs take a look into the build-dir :)
-	mkdir -p $(1)/etc
+	$(INSTALL_DIR) $(1)/etc
 	$(CP)   $(PKG_INSTALL_DIR)/etc/* \
 		$(1)/etc
-	mkdir -p $(1)/usr/include/apache
+	$(INSTALL_DIR) $(1)/usr/include/apache
 	$(CP)	$(PKG_INSTALL_DIR)/usr/include/* \
 		$(1)/usr/include/apache
-	mkdir -p $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/httpd.exp \
 		$(1)/usr/lib
-	mkdir -p $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP)   $(PKG_INSTALL_DIR)/usr/sbin/* \
 		$(1)/usr/sbin
-	mkdir -p $(1)/usr/share
+	$(INSTALL_DIR) $(1)/usr/share
 	$(CP)   $(PKG_INSTALL_DIR)/usr/share/* \
 		$(1)/usr/share
 endef