fix duplicate PKG_NAME use

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9953 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 221bbb1..acb4cf6 100644 (file)
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -8,13 +8,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=php
+PKG_NAME:=php4
 PKG_VERSION:=4.3.11
 PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://fr.php.net/distributions/
 PKG_MD5SUM:=fbc67d240812136a9842bc1f2a217b7a
+PKG_BUILD_DIR:=$(BUILD_DIR)/php-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index d36a1f5..34c57ea 100644 (file)
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -8,11 +8,11 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libnet
+PKG_NAME:=libnet0
 PKG_VERSION:=1.0.2a
 PKG_RELEASE:=7
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=libnet-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667