[packages] Use default templates instead of custom reimplementations where applicable

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

Xorg/lib/atk/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,16 +10,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atk
 PKG_VERSION:=1.22.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/
 PKG_MD5SUM:=06a2b39a22d5ca35c47435da6b9643ac
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/
+TARGET_LDFLAGS += \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
 
 define Package/atk
   SECTION:=xorg-libs
@@ -29,11 +33,6 @@ define Package/atk
   DEPENDS:=+glib2
 endef
 
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/{lib,include}
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib

Xorg/lib/tslib/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -14,7 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.berlios.de/tslib/
 
-PKG_FIXUP = libtool
+PKG_INSTALL:=1
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,7 +32,7 @@ define Package/tslib/description
 	Tslib is an abstraction layer for touchscreen panel events,
 	as well as a filter stack for the manipulation of those events.
 	It was created by Russell King, of arm.linux.org.uk.
-	Examples of implemented filters include jitter smoothing and the calibration transform. 
+	Examples of implemented filters include jitter smoothing and the calibration transform.
 endef
 
 ifeq ($(CONFIG_TARGET_om_gta02),y)
@@ -43,10 +44,6 @@ define Build/Configure
 	$(call Build/Configure/Default, --enable-malloc0returnsnull)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/

Xorg/wm/matchbox-window-manager/Makefile

@@ -14,7 +14,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://matchbox-project.org/sources/$(PKG_NAME)/$(PKG_VERSION)
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 TARGET_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -37,7 +39,7 @@ define Build/Compile
 		LIBMB_LIBS="$(TARGET_LDFLAGS) -lfontconfig -lXrender \
 		-lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp \
 		-lpng12" \
-		all install 
+		all
 endef
 
 define Package/matchbox-window-manager/install
@@ -50,7 +52,7 @@ define Package/matchbox-window-manager/install
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/bin/* \
 		$(1)/usr/bin/
-	
+
 	$(INSTALL_DIR) $(1)/usr/share/{matchbox,themes}
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/share/matchbox/* \

admin/zabbix/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
 
 PKG_BUILD_DEPENDS:=libsqlite3
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -65,12 +66,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/zabbix-agent/conffiles
 /etc/zabbix/zabbix_agentd.conf
 endef

lang/egenix-mx/Makefile

@@ -35,6 +35,8 @@ define Package/python-egenix-mx/description
  python packages.
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
 	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
 	$(call Build/Compile/PyMod,., \

lang/perl/Makefile

@@ -60,7 +60,7 @@ endef
 define Build/microperl/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.micro \
 		CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)"
-	mkdir -p $(PKG_INSTALL_DIR)/usr/bin/
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/bin/
 	$(CP) $(PKG_BUILD_DIR)/microperl $(PKG_INSTALL_DIR)/usr/bin/
 endef
 

lang/pygtk/Makefile

@@ -19,11 +19,11 @@ PKG_FIXUP:=libtool
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
-EXTRA_CFLAGS+= \
+TARGET_CFLAGS+= \
 	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
 	-I$(STAGING_DIR)/usr/lib/libiconv/include/
 
-EXTRA_LDFLAGS+= \
+TARGET_LDFLAGS+= \
 	-L$(STAGING_DIR)/usr/lib/libintl/lib \
 	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 

lang/pygtk/patches/010-dont-override-python-include-dir.patch

@@ -1,24 +0,0 @@
-diff -urN pygtk-2.12.1.orig/configure pygtk-2.12.1/configure
---- pygtk-2.12.1.orig/configure	2008-09-30 17:05:56.000000000 +0200
-+++ pygtk-2.12.1/configure	2008-09-30 17:06:38.000000000 +0200
-@@ -10399,8 +10399,6 @@
- 
- { echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5
- echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; }
--py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
-diff -urN pygtk-2.12.1.orig/configure.in pygtk-2.12.1/configure.in
---- pygtk-2.12.1.orig/configure.in	2008-09-30 17:05:56.000000000 +0200
-+++ pygtk-2.12.1/configure.in	2008-09-30 17:06:24.000000000 +0200
-@@ -78,8 +78,6 @@
- AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
- 
- AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
--py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
- AC_TRY_COMPILE([#include <Python.h>],

libs/aalib/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/aa-project
 PKG_MD5SUM:=790434e0f2005fc95559ab3eab42e746
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,20 +25,17 @@ define Package/libaa
   CATEGORY:=Libraries
   TITLE:=Ascii-Art rendering library
   URL:=http://aa-project.sourceforge.net/
-  DEPENDS:= +libncurses
+  DEPENDS:=+libncurses
 endef
 
-CONFIGURE_ARGS+= \
+define Build/Configure
-	--enable-shared \
+	$(call Build/Configure/Default, \
-	--enable-static \
+		--enable-shared \
-	--without-x \
+		--enable-static \
-	--without-x11-driver \
+		--without-x \
-	--without-slang-driver \
+		--without-x11-driver \
-
+		--without-slang-driver \
-define Build/Compile
+	)
-	$(MAKE) -C $(PKG_BUILD_DIR) all \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
 endef
 
 define Build/InstallDev

libs/apr/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
 PKG_MD5SUM:=7138ac64d4458eeeaa9b9aefa4e6e51b
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -41,10 +42,6 @@ CONFIGURE_VARS += \
 	apr_cv_tcp_nodelay_with_cork=yes \
 	LDFLAGS="$$$$LDFLAGS -lpthread" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
 	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \

libs/argtable/Makefile

@@ -53,12 +53,6 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libargtable2.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-	$(STAGING_DIR)/usr/include/argtable2.h \
-	$(STAGING_DIR)/usr/lib/libargtable2.{a,so*}
-endef
-
 define Package/argtable/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libargtable2.so.* $(1)/usr/lib/

libs/avahi/Makefile

@@ -17,7 +17,8 @@ PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e
 
 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,7 +43,7 @@ define Package/libavahi
   $(call Package/avahi/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libdaemon +libpthread
+  DEPENDS:=+libdaemon +libpthread +libgdbm
   TITLE+= (library)
 endef
 
@@ -150,12 +151,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/

libs/bluez-libs/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bluez-libs
 PKG_VERSION:=3.36
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
 PKG_MD5SUM:=8c2ca546c0e7bb73dbd0e906fce7f6b1
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bluez-libs
@@ -30,12 +32,6 @@ CONFIGURE_ARGS += \
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/bluetooth
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth

libs/classpath/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=classpath
 PKG_VERSION:=0.98
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/classpath
 PKG_MD5SUM:=90c6571b8b0309e372faa0f9f6255ea9
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/classpath
@@ -25,23 +27,20 @@ define Package/classpath
   MAINTAINER:=Roberto Riggio (roberto.riggio@create-net.org)
 endef
 
-define Package/classpath/Description 
+define Package/classpath/Description
 	GNU Classpath, Essential Libraries for Java, is a GNU project 
 	to create free core class libraries for use with virtual 
 	machines and compilers for the java programming language.
-endef 
+endef
 
-CONFIGURE_ARGS+= \
+define Build/Configure
-	--with-javac \
+	$(call Build/Configure/Default, \
-	--enable-jni \
+		--with-javac \
-	--disable-gtk-peer \
+		--enable-jni \
-	--disable-gconf-peer \
+		--disable-gtk-peer \
-	--disable-plugin \
+		--disable-gconf-peer \
-
+		--disable-plugin \
-define Build/Compile	
+	)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		all install
 endef
 
 define Package/classpath/install

libs/clinkc/Makefile

@@ -18,6 +18,7 @@ PKG_MD5SUM:=4c8ac54a15da47203a86daf77fbc2664
 PKG_BUILD_DIR:=$(BUILD_DIR)/CyberLinkC
 
 PKG_BUILD_DEPENDS:=libexpat
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -39,9 +40,7 @@ TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
 	chmod +x $(PKG_BUILD_DIR)/config/install-sh
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(call Build/Compile/Default)
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
 endef
 
 define Build/InstallDev

libs/db47/Makefile

@@ -73,8 +73,6 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
 		DESTDIR="$(PKG_INSTALL_DIR)" install
 endef

libs/eventlog/Makefile

@@ -14,6 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libeventlog
@@ -28,12 +30,6 @@ define Package/eventlog/description
   (local syslogd).
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/

libs/faad2/Makefile

@@ -15,10 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/faac
 PKG_MD5SUM:=4c332fa23febc0e4648064685a3d4332
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/faad2/Default
   URL:=http://www.audiocoding.com/faad2.html
   TITLE:=Freeware Advanced Audio Decoder
@@ -71,12 +74,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install \
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include

libs/fcgi/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.fastcgi.com/dist/
 PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e
 
 PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,10 +45,6 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
 	LIBS="-nodefaultlibs -luClibc++ -lm" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/

libs/file/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
 PKG_MD5SUM:=74cd5466416136da30a4e69f74dbc7a0
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libmagic
@@ -40,22 +42,22 @@ define Package/file/description
  that succeeds causes the file type to be printed.
 
  Starting with version 4, the file command is not much more than
- a wrapper around the "magic" library. 
+ a wrapper around the "magic" library.
 endef
 
+MAKE_PATH:=src
+
 TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS += \
+define Build/Configure
-	--enable-shared \
+	$(call Build/Configure/Default, \
-	--enable-static \
+		--enable-shared \
-	--disable-rpath \
+		--enable-static \
-	--without-libiconv-prefix \
+		--disable-rpath \
-	--without-libintl-prefix \
+		--without-libiconv-prefix \
-
+		--without-libintl-prefix \
-MAKE_FLAGS += \
+	)
-	-C $(PKG_BUILD_DIR)/src \
+endef
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install \
 
 define Build/Prepare
 	$(call Build/Prepare/Default)

libs/gd/Makefile

@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.libgd.org/releases
 PKG_MD5SUM:=6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -53,12 +54,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/

libs/glib/Makefile

@@ -18,7 +18,8 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 	http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,6 +37,7 @@ define Package/glib1/description
 endef
 
 TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
 
 CONFIGURE_ARGS += \
 	--enable-shared \
@@ -57,11 +59,6 @@ CONFIGURE_VARS += \
 	glib_cv_sizeof_gmutex=24 \
 	glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
 
-TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1) $(2)/bin
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/

libs/gsl/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@GNU/gsl
 PKG_MD5SUM:=81dca4362ae8d2aa1547b7d010881e43
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,15 +36,6 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/libgsl/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsl.so* $(1)/usr/lib/

libs/gsm/Makefile

@@ -63,8 +63,6 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		LD="$(TARGET_CC)" \

libs/howl/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=howl
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.porchdogsoft.com/download/
 PKG_MD5SUM:=c389d3ffba0e69a179de2ec650f1fdcc
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/howl/Default
   SECTION:=net
   CATEGORY:=Network
@@ -89,14 +93,6 @@ define Build/Configure
 	);
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(1)/usr/include/

libs/id3lib/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/id3lib
 PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
 
 PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,16 +32,12 @@ TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
 	--enable-shared \
-	--enable-static \
+	--disable-static
 
-CONFIGURE_VARS += \
+#CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"  \
 	LIBS="-nodefaultlibs -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(1)/usr/include/

libs/iksemel/Makefile

@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://iksemel.googlecode.com/files/
 PKG_MD5SUM:=532e77181694f87ad5eb59435d11c1ca
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,17 +36,18 @@ define Package/libiksemel/description
 endef
 
 TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += \
+	-Wl,-rpath-link,$(STAGING_DIR)/usr/lib \
+	-lgnutls -lgcrypt -lgpg-error
 
-CONFIGURE_ARGS += \
+define Build/Configure
-	--enable-shared \
+	$(call Build/Configure/Default, \
-	--enable-static \
+		--enable-shared \
-	--with-libgnutls-prefix="$(STAGING_DIR)/usr" \
+		--enable-static \
-
+		--with-libgnutls-prefix="$(STAGING_DIR)/usr" \
-CONFIGURE_VARS += \
+		, \
-	LIBS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -lgnutls -lgcrypt -lgpg-error" \
+		LIBS="$(TARGET_LDFLAGS)" \
-
+	)
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev

libs/jpeg/Makefile

@@ -62,8 +62,7 @@ define Build/Prepare
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
-	mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LIBTOOL="./libtool --tag=CC" \
 		prefix="$(PKG_INSTALL_DIR)/usr" \

libs/libaio/Makefile

@@ -28,7 +28,7 @@ endef
 define Build/Configure
 endef
 
-LIBAIO_CFLAGS:=-nostdlib -nostartfiles -I. $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
+LIBAIO_CFLAGS:=-nostdlib -nostartfiles -I. $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)
 
 TARGET_CFLAGS += $(FPIC)
 

libs/libao/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
 PKG_MD5SUM:=b92cba3cbcf1ee9bc221118a85d23dcd
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libao
@@ -40,12 +42,6 @@ CONFIGURE_ARGS += \
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/

libs/libatomicops/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libatomicops
 PKG_VERSION:=1.2
 PKG_EXTRA_VERSION:=+cvs20080819.orig
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=libatomic-ops_$(PKG_VERSION)$(PKG_EXTRA_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/liba/libatomic-ops/
@@ -18,6 +18,8 @@ PKG_MD5SUM:=bf26c062f28796e3daaab586a38abec1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libatomic_ops-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libatomicops
@@ -44,12 +46,6 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/

libs/libcelt/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -15,7 +15,9 @@ PKG_SOURCE:=celt-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/celt-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/celt/
 PKG_MD5SUM:=0bb72abec367f4ef12551f79dda11b23
+
 PKG_BUILD_DEPENDS:=libogg
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,24 +32,18 @@ define Package/libcelt/description
  The CELT codec is an experimental audio codec for use in low-delay speech and audio communication.
 endef
 
-CONFIGURE_ARGS += \
+define Build/Configure
-	--without-ogg
+	$(call Build/Configure/Default, \
-
+		--without-ogg \
-define Build/Compile
+	)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/celt
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/celt/celt*.h \
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/celt/celt*.h \
 		$(1)/usr/include/celt
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/* \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* \
 		$(1)/usr/lib/
 endef
 

libs/libcrypto++/Makefile

@@ -14,6 +14,8 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libc/libcrypto++/
 PKG_MD5SUM:=
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libcryptoxx
@@ -41,13 +43,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/crypto++
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/crypto--/* $(1)/usr/include/crypto++/

libs/libdaemon/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
 PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdaemon
@@ -47,12 +49,6 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/

libs/libdbi/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdbi
 PKG_VERSION:=0.8.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libdbi
 PKG_MD5SUM:=
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdbi
@@ -31,12 +33,6 @@ define Package/libdbi/description
 	(v3.x) shared library, used by other programs.
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/dbi $(1)/usr/include/

libs/libdmapsharing/Makefile

@@ -19,12 +19,14 @@ PKG_MD5SUM:=11839bcf9aac8f1de5e101d13e9e8422
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= \
+TARGET_CFLAGS+= \
 	-I$(STAGING_DIR)/usr/lib/libintl/include
 
-EXTRA_LDFLAGS+= \
+TARGET_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 	-L$(STAGING_DIR)/usr/lib/libintl/lib
 
@@ -40,12 +42,6 @@ define Package/libdmapsharing/decription
   Libdmapsharing is a DMAP library implementation in C
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/
 	$(CP) \

libs/libdnet/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdnet
 PKG_VERSION:=1.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -59,10 +61,6 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	ac_cv_dnet_bsd_bpf=no
 
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(2)/bin
 	$(INSTALL_BIN) \

libs/libffi-sable/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libffi-sable
 PKG_VERSION:=3325
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/
 PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libffi-sable
@@ -42,20 +44,14 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile	
+define Build/InstallDev
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev	
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(1)/usr/lib/
 endef
 
-define Package/libffi-sable/install	
+define Package/libffi-sable/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/
 endef

libs/libgcrypt/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
 PKG_MD5SUM:=34105aa927e23c217741966496b97e67
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,12 +50,6 @@ CONFIGURE_ARGS+= \
 	--enable-ciphers="arcfour des aes" \
 	--enable-pubkey-ciphers="rsa dsa" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/

libs/libid3tag/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libid3tag
 PKG_VERSION:=0.15.1b
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad
 PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libid3tag
@@ -41,12 +43,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(1)/usr/include/

libs/libjson-c/Makefile

@@ -15,8 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://oss.metaparadigm.com/json-c/
 PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries
@@ -28,14 +32,6 @@ define Package/libjson/description
  This package contains a library for javascript object notation backends.
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/

libs/libmad/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmad
 PKG_VERSION:=0.15.1b
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
 	ftp://ftp.mars.org/pub/mpeg/
 PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 FPM:=default
@@ -45,17 +47,15 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS += \
+define Build/Configure
-	--enable-shared \
+	$(call Build/Configure/Default, \
-	--enable-static \
+		--enable-shared \
-	--enable-fpm="$(FPM)" \
+		--enable-static \
-	--disable-debugging \
+		--enable-fpm="$(FPM)" \
-	--enable-speed \
+		--disable-debugging \
-
+		--enable-speed \
-MAKE_FLAGS += \
+	)
-	CFLAGS="$(TARGET_CFLAGS)" \
+endef
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include

libs/libmcrypt/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,8 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/mcrypt
 PKG_MD5SUM:=c4f491dd411a09e9de3b8702ea6f73eb
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libmcrypt
   SECTION:=libs
   CATEGORY:=Libraries
@@ -36,14 +40,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/

libs/libmms/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,8 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.launchpad.net/libmms/trunk/$(PKG_VERSION)/+download/
 PKG_MD5SUM:=cf83053ec891f14e73a04c84d9de08ee
 
-PKG_FIXUP:= libtool
+PKG_FIXUP:=libtool
-PKG_INSTALL:= 1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,12 +42,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmms $(1)/usr/include/
@@ -56,14 +50,6 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/libmms \
-		$(STAGING_DIR)/usr/lib/libmms.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/libmms.pc
-endef
-
-
 define Package/libmms/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.so.* $(1)/usr/lib/

libs/libmpd/Makefile

@@ -15,8 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.sarine.nl/Programs/gmpc/$(PKG_VERSION)/
 PKG_MD5SUM:=a994f5f25a22c778926a3684c3e3050d
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
+
 define Package/libmpd
   SECTION:=libs
   CATEGORY:=Libraries
@@ -28,14 +33,6 @@ define Package/libmpd/description
 It's wraps around libmpdclient and provides a higher level api.
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd-1.0 $(1)/usr/include/

libs/libnet-1.0.x/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -55,14 +56,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	# pass CFLAGS again to override -O2 set by configure
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/bin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/

libs/libnet-1.1.x/Makefile

@@ -17,6 +17,8 @@ PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnet1
@@ -55,14 +57,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	# pass CFLAGS again to override -O2 set by configure
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/

libs/libnfnetlink/Makefile

@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnfnetlink/ \
 	http://mirrors.evolva.ro/netfilter.org/libnfnetlink/
 PKG_MD5SUM:=016fdec8389242615024c529acc1adb8
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnfnetlink
@@ -39,13 +41,6 @@ CONFIGURE_ARGS += \
 	--enable-static \
 	--enable-shared
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libnfnetlink
 	$(CP) \

libs/libosip2/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=7eb305608256ac2a7a27b66ce52627c8
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,17 +34,16 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS+= \
+define Build/Configure
-	--enable-shared \
+	$(call Build/Configure/Default, \
-	--enable-static \
+		--enable-shared \
-	--disable-debug \
+		--enable-static \
-	--disable-trace \
+		--disable-debug \
-	--enable-pthread \
+		--disable-trace \
-	--enable-semaphore \
+		--enable-pthread \
-	--enable-ntimer \
+		--enable-semaphore \
-
+		--enable-ntimer \
-define Build/Compile
+	)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev

libs/libpar2/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/parchive
 PKG_MD5SUM:=94c6df4e38efe08056ecde2a04e0be91
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,14 +35,6 @@ CONFIGURE_ARGS += \
 	--disable-static \
 	--disable-nls \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libpar2
 	$(INSTALL_DATA) \

libs/libpng/Makefile

@@ -15,11 +15,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libpng
 PKG_MD5SUM:=2faa7f8d81e6a35beb991cb75edbf056
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libpng
   SECTION:=libs
   CATEGORY:=Libraries
@@ -36,18 +39,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Host/Install
-	$(MAKE) -C "$(HOST_BUILD_DIR)" install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(2)/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/

libs/librsync/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=librsync
 PKG_VERSION:=0.9.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/librsync
 PKG_MD5SUM:=24cdb6b78f45e0e83766903fd4f6bc84
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/librsync
   SECTION:=libs
   CATEGORY:=Libraries
@@ -38,14 +42,6 @@ define Build/Configure
 	);
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/librsync{,-config}.h $(1)/usr/include/

libs/libsamplerate/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/
 PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,12 +38,6 @@ TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
 	--disable-fftw \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/

libs/libshout/Makefile

@@ -15,10 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/
 PKG_MD5SUM:=4f75fc9901c724b712c371c9a1e782d3
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libshout
   SECTION:=libs
   DEPENDS:=+libvorbisidec
@@ -44,14 +47,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/shout
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout

libs/libsndfile/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsndfile
 PKG_VERSION:=1.0.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mega-nerd.com/libsndfile/
 PKG_MD5SUM:=e0553e12c7a467af44693e95e2eac668
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,15 +35,13 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS += \
+define Build/Configure
-	--disable-alsa \
+	$(call Build/Configure/Default, \
-	--disable-external-libs \
+		--disable-alsa \
-	--disable-sqlite \
+		--disable-external-libs \
-
+		--disable-sqlite \
-define Build/Compile
+		--disable-shave \
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	)
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
 endef
 
 define Build/InstallDev

libs/libsynce/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.

libs/libtasn1/Makefile

@@ -19,7 +19,8 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 	http://josefsson.org/gnutls/releases/libtasn1/
 PKG_MD5SUM:=a733ecdfed3517910e627d24e050979f
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -41,10 +42,6 @@ CONFIGURE_ARGS += \
 		--enable-shared \
 		--enable-static
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(1)/usr/bin/

libs/libtorrent/Makefile

@@ -10,7 +10,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libtorrent
 PKG_REV:=1130
 PKG_VERSION:=0.12.6_r$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/libtorrent

libs/libtwin/Makefile

@@ -59,10 +59,6 @@ define Build/InstallDev
 		$(1)/usr/lib/pkgconfig/
 endef
 
-define Build/UninstallDev
-	rm -rf $(1)/usr/include/libtwin
-endef
-
 define Package/libtwin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) \

libs/libvorbisidec/Makefile

@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
 PKG_MD5SUM:=bc617d4af1cd74b38d7c51451dd6eff0
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,12 +44,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(1)/usr/include/

libs/libyaml/Makefile

@@ -19,6 +19,8 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libyaml
   SUBMENU:=Python
   SECTION:=lang

libs/mysql/Makefile

@@ -68,8 +68,6 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		SUBDIRS="include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \

libs/popt/Makefile

@@ -15,8 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libpopt
   SECTION:=libs
   CATEGORY:=Libraries
@@ -31,14 +35,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(1)/usr/include/

libs/rrdtool-1.0.x/Makefile

@@ -99,8 +99,6 @@ CONFIGURE_VARS += \
 	shrext_cmds=".so"
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		shrext_cmds=".so" \

libs/sqlite2/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -18,9 +18,12 @@ PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b
 PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
 
 PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/sqlite2/Default
   SUBMENU:=database
   TITLE:=SQLite (v2.x) database engine
@@ -35,7 +38,6 @@ define Package/libsqlite2
 endef
 
 define Package/libsqlite2/description
-=
 	SQLite is a small C library that implements a self-contained, embeddable, 
 	zero-configuration SQL database engine.	
 	This package contains the SQLite (v2.x) shared library, used by other programs.
@@ -51,7 +53,6 @@ define Package/sqlite2-cli
 endef
 
 define Package/sqlite2-cli/description
-=
 	SQLite is a small C library that implements a self-contained, embeddable, 
 	zero-configuration SQL database engine.	
 	This package contains a terminal-based front-end to the SQLite (v2.x) library 
@@ -74,14 +75,6 @@ define Build/Configure
 	)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(1)/usr/include/

libs/sqlite3/Makefile

@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=4bb3e9ee5d25e88b8ff8533fbeb168aa
 
 PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -73,12 +74,6 @@ CONFIGURE_VARS += \
 	config_TARGET_READLINE_INC="$(TARGET_CPPFLAGS)" \
 	config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/

libs/ustl/Makefile

@@ -41,8 +41,6 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CROSS="$(TARGET_CROSS)" \
 		OPTFLAGS="$(TARGET_CFLAGS)" \

libs/wxbase/Makefile

@@ -17,6 +17,8 @@ PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libwxbase
@@ -113,12 +115,6 @@ else
   LIB_PFX:=
 endif
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
 	$(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/

multimedia/gst-plugins-good/Makefile

@@ -82,7 +82,7 @@ define Build/Configure
 		--disable-sunaudio \
 		--without-x \
 	)
-	mkdir -p $(PKG_BUILD_DIR)/bin
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)/bin
 	touch $(PKG_BUILD_DIR)/bin/gtkdoc-rebase
 	chmod +x $(PKG_BUILD_DIR)/bin/gtkdoc-rebase
 endef

multimedia/hasciicam/Makefile

@@ -17,6 +17,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=262f56eb307f9a0d4bee04d38e0adde7e4257d87
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hasciicam
@@ -31,13 +33,7 @@ endef
 CONFIGURE_VARS += \
 	LIBS="-lncurses" \
 
-define Build/Compile
+define Package/hasciicam/install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/hasciicam/install	
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hasciicam $(1)/usr/bin/
 endef

multimedia/motion/Makefile

@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \
 		@SF/motion
 PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/motion
@@ -36,12 +38,6 @@ CONFIGURE_ARGS+= \
 	--without-mysql \
 	--without-pgsql \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/motion/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf

multimedia/peercast/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=peercast
 PKG_VERSION:=0.1214
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
 PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/peercast
@@ -44,13 +46,7 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
 	LIBS="-nodefaultlibs -luClibc++ -lpthread" \
 
-define Build/Compile
+define Package/peercast/install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/peercast/install	
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/share/peercast/html

net/aircrack-ng/Makefile

@@ -33,8 +33,6 @@ define Build/Configure
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \

net/aircrack-ptw/Makefile

@@ -30,8 +30,6 @@ define Build/Configure
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
 		$(TARGET_LDFLAGS) \
 		-lpcap -o $(PKG_BUILD_DIR)/aircrack-ptw \

net/amwall/Makefile

@@ -27,8 +27,6 @@ define Package/amwall
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		V= \

net/apache/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apache
 PKG_VERSION:=2.2.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE_NAME:=httpd
 
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
@@ -19,6 +19,8 @@ PKG_MD5SUM:=a5226203aaf97e5b941c41a71c112704
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/apache/Default
@@ -103,12 +105,6 @@ define Build/Configure
 	)
 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/

net/appweb/Makefile

@@ -49,8 +49,6 @@ define Package/appweb/description
 endef
 
 define Build/Prepare
-	rm -rf $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)
 	tar xzf "$(DL_DIR)/$(PKG_SOURCE)" --strip-components 1 -C "$(PKG_BUILD_DIR)"
 endef
 

net/arpd/Makefile

@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/arpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpcap +libdnet +libevent +librt
+  DEPENDS:=+libpcap +libdnet +libevent +librt @BROKEN
   TITLE:=A daemon to fake ARP replies
   URL:=http://niels.xtdnet.nl/honeyd/
 endef

net/bind/Makefile

@@ -90,8 +90,6 @@ CONFIGURE_ARGS += \
 		BUILD_CC="$(TARGET_CC)" \
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
 		BUILD_CC="$(HOSTCC)" \
 		CC="$(HOSTCC)" \

net/bitchx/Makefile

@@ -31,8 +31,6 @@ define Package/bitchx
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \

net/chillispot/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chillispot
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.chillispot.info/download
 PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b
 
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,12 +44,6 @@ endef
 
 # uses GNU configure
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/chillispot/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli

net/click/Makefile

@@ -76,8 +76,6 @@ endef
 
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(CONF_OPTS) \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(BUILDOPTS) \

net/cups/Makefile

@@ -67,8 +67,6 @@ define Build/Configure
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		DSTROOT="$(PKG_INSTALL_DIR)" \

net/dansguardian/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable
 PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dansguardian
@@ -46,12 +48,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/dansguardian/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/

net/darkstat/Makefile

@@ -39,7 +39,6 @@ CONFIGURE_ARGS += \
 	--with-chroot-dir /var/empty
 
 define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(HOSTCC) $(PKG_BUILD_DIR)/static/c-ify.c \
 		-o $(PKG_BUILD_DIR)/c-ify
 	$(MAKE) -C $(PKG_BUILD_DIR) \

net/dhcpcd/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/
 PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dhcpcd
@@ -29,14 +31,6 @@ define Package/dhcpcd/description
 	IP address changes.
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		all install
-endef
-
 define Package/dhcpcd/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(CP) $(PKG_INSTALL_DIR)/sbin/* $(1)/sbin/

net/dircproxy/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dircproxy.googlecode.com/files/
 PKG_MD5SUM:=4fe2e82619c7b575599bfb236adbd872
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dircproxy
@@ -27,12 +29,6 @@ endef
 
 # uses Build/Configure/Default
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/dircproxy/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/

net/ekg/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ekg
 PKG_VERSION:=1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ekg.chmurka.net/
 PKG_MD5SUM:=2aa92b56517fdf09d75519a105772b74
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ekg
@@ -39,12 +41,6 @@ CONFIGURE_VARS+= \
 	CFLAGS="$$$$CFLAGS $(TARGET_CPPFLAGS)" \
 	CFLAGS_LIBGADU="$$$$CFLAGS $(TARGET_CPPFLAGS)" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/ekg/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ekg $(1)/usr/bin/

net/faifa/Makefile

@@ -41,8 +41,6 @@ define Build/Configure
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -DSVN_REV=$(PKG_REV) $(TARGET_CPPFLAGS)" \

net/gpsd/Makefile

@@ -16,8 +16,9 @@ PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
 PKG_MD5SUM:=a23c728b8734c542d559c485857238d2
 
 PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
 
-PKG_BUILD_DEPENDS=libncurses
+PKG_BUILD_DEPENDS:=libncurses
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,12 +50,6 @@ CONFIGURE_VARS += \
 	LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
 	CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/

net/ipcad/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ipcad
 PKG_MD5SUM:=125605249958894148ec26d3c88189f5
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipcad
@@ -49,13 +51,7 @@ CONFIGURE_VARS += \
 	ac_cv_header_linux_netfilter_ipv4_ip_queue_h=no \
 	ac_cv_header_linux_netfilter_ipv4_ipt_ULOG_h=no \
 
-define Build/Compile	
+define Package/ipcad/install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/ipcad/install	
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/bin

net/ipkungfu/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.linuxkungfu.org/ipkungfu
 PKG_MD5SUM:=89f6bc0df356dd4ee650882c54ec9074
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipkungfu
@@ -67,12 +69,6 @@ CONFIGURE_VARS+= \
 		 ac_cv_path_SED="/bin/sed" \
 		 ac_cv_path_AWK="/usr/bin/awk" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/ipkungfu/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dummy_server $(1)/usr/sbin/

net/ipsec-tools/Makefile

@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=821bd84e8d4ad5a93bf594b8b3d66e1e
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipsec-tools
@@ -58,12 +60,6 @@ define Build/Configure
 endef
 
 # override CFLAGS holding "-Werror" that break builds on compile warnings
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		all install
-endef
 
 define Package/ipsec-tools/install
 	$(INSTALL_DIR) $(1)/etc

net/keepalived/Makefile

@@ -50,8 +50,6 @@ CONFIGURE_VARS+= \
 	ac_cv_file_$(call acvar,$(LINUX_DIR)/net/core/link_watch.c)=yes
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		STRIP="/bin/true" \

net/krb5/Makefile

@@ -10,8 +10,12 @@ PKG_MD5SUM:=9f7b3402b4731a7fa543db193bf1b564
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_PATH:=src
+
 define Package/krb5/Default
 	SECTION:=net
 	CATAGORY:=Network
@@ -83,16 +87,6 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	rm -rf "$(PKG_INSTALL_DIR)"
-	mkdir -p "$(PKG_INSTALL_DIR)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CC="$(TARGET_CC)" \
-		all install
-endef
-
 define Package/krb5-libs/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/krb5

net/matrixtunnel/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=matrixtunnel
 PKG_VERSION:=0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znerol.ch/files
@@ -17,8 +17,12 @@ PKG_MD5SUM:=af169751efc7d87d500716a48d74ddc5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_PATH:=src
+
 define Package/matrixtunnel
   SECTION:=net
   CATEGORY:=Network
@@ -41,12 +45,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/matrixtunnel/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/

net/miau/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/miau
 PKG_MD5SUM:=cbce4182d66430a965a5fff26738ce3f
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miau
@@ -39,12 +41,8 @@ CONFIGURE_ARGS += \
 	--enable-privlog \
 	--enable-onconnect
 
-MAKE_FLAGS += \
+define Package/miau/install
-	DESTDIR="$(PKG_INSTALL_DIR)" \
+	$(INSTALL_DIR) $(1)/usr/bin
-	all install
-
-define Package/miau/install	
-	$(INSTALL_DIR) $(1)/usr/bin  	
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/default

net/mtr/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr/
 PKG_MD5SUM:=23baca52d0922c2ecba7eba05317868c
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mtr
@@ -53,12 +55,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/mtr/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/

net/mutella/Makefile

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mutella
 PKG_VERSION:=0.4.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=1a676eacf562e3b8de90493f99fe059c
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -48,10 +49,6 @@ define Build/Prepare
 	$(SED) 's,-L$$$$(libdir),,g' $(PKG_BUILD_DIR)/{mutella,util}/Makefile.in
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Package/mutella/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutella{,_sio} $(1)/usr/bin/

net/nagios-plugins/Makefile

@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/nagiosplug
 PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 comma:= ,
@@ -41,12 +43,6 @@ CONFIGURE_ARGS += \
 	--with-ssh-command="/usr/bin/ssh" \
 	--with-nslookup-command="/usr/bin/nslookup"
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Package/nagios-plugins/install
 	$(INSTALL_DIR) $(1)/usr/libexec/nagios
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/