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

author lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>

Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)

committer lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>

Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)
author lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)
committer lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)
diff --git a/Xorg/lib/atk/Makefile b/Xorg/lib/atk/Makefile

index 0d0ab98..da5a1bf 100644 (file)
--- a/Xorg/lib/atk/Makefile
+++ b/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.
  #
  # 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_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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/
  PKG_MD5SUM:=06a2b39a22d5ca35c47435da6b9643ac
+
  PKG_FIXUP:=libtool
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  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
  
  define Package/atk
    SECTION:=xorg-libs
@@ -29,11 +33,6 @@ define Package/atk
    DEPENDS:=+glib2
  endef
  
    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
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/{lib,include}
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
diff --git a/Xorg/lib/tslib/Makefile b/Xorg/lib/tslib/Makefile

index fe0d122..158a673 100644 (file)
--- a/Xorg/lib/tslib/Makefile
+++ b/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.
  #
  # 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_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
  
  
  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.
         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)
  endef
  
  ifeq ($(CONFIG_TARGET_om_gta02),y)
@@ -43,10 +44,6 @@ define Build/Configure
         $(call Build/Configure/Default, --enable-malloc0returnsnull)
  endef
  
         $(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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
         $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile

index bbb940c..2df55ff 100644 (file)
--- a/Xorg/wm/matchbox-window-manager/Makefile
+++ b/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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://matchbox-project.org/sources/$(PKG_NAME)/$(PKG_VERSION)
+
  PKG_FIXUP:=libtool
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  TARGET_LDFLAGS+= \
         -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
  
  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" \
                 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
  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_BIN) \
                 $(PKG_INSTALL_DIR)/usr/bin/* \
                 $(1)/usr/bin/
-       
+
         $(INSTALL_DIR) $(1)/usr/share/{matchbox,themes}
         $(INSTALL_DATA) \
                 $(PKG_INSTALL_DIR)/usr/share/matchbox/* \
         $(INSTALL_DIR) $(1)/usr/share/{matchbox,themes}
         $(INSTALL_DATA) \
                 $(PKG_INSTALL_DIR)/usr/share/matchbox/* \
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile

index 782c908..43dc9bc 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/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_SOURCE_URL:=@SF/zabbix
  
  PKG_BUILD_DEPENDS:=libsqlite3
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -65,12 +66,6 @@ define Build/Configure
         )
  endef
  
         )
  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
  define Package/zabbix-agent/conffiles
  /etc/zabbix/zabbix_agentd.conf
  endef
diff --git a/lang/egenix-mx/Makefile b/lang/egenix-mx/Makefile

index 29a4086..fbc7999 100644 (file)
--- a/lang/egenix-mx/Makefile
+++ b/lang/egenix-mx/Makefile
@@ -35,6 +35,8 @@ define Package/python-egenix-mx/description
   python packages.
  endef
  
   python packages.
  endef
  
+TARGET_CFLAGS += $(FPIC)
+
  define Build/Compile
         $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
         $(call Build/Compile/PyMod,., \
  define Build/Compile
         $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
         $(call Build/Compile/PyMod,., \
diff --git a/lang/perl/Makefile b/lang/perl/Makefile

index c23bd71..a54ca87 100644 (file)
--- a/lang/perl/Makefile
+++ b/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)"
  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
  
         $(CP) $(PKG_BUILD_DIR)/microperl $(PKG_INSTALL_DIR)/usr/bin/
  endef
  
diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile

index f593ad7..1b1b108 100644 (file)
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -19,11 +19,11 @@ PKG_FIXUP:=libtool
  include $(INCLUDE_DIR)/package.mk
  -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
  
  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/
  
         -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
  
         -L$(STAGING_DIR)/usr/lib/libintl/lib \
         -L$(STAGING_DIR)/usr/lib/libiconv/lib
  
diff --git a/lang/pygtk/patches/010-dont-override-python-include-dir.patch b/lang/pygtk/patches/010-dont-override-python-include-dir.patch

deleted file mode 100644 (file)

index d12576f..0000000
--- a/lang/pygtk/patches/010-dont-override-python-include-dir.patch
+++ /dev/null
@@ -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>],
diff --git a/libs/aalib/Makefile b/libs/aalib/Makefile

index cf8d0d7..c5e5698 100644 (file)
--- a/libs/aalib/Makefile
+++ b/libs/aalib/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/aa-project
  PKG_MD5SUM:=790434e0f2005fc95559ab3eab42e746
  
  PKG_FIXUP:=libtool
  PKG_MD5SUM:=790434e0f2005fc95559ab3eab42e746
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  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/
    CATEGORY:=Libraries
    TITLE:=Ascii-Art rendering library
    URL:=http://aa-project.sourceforge.net/
-  DEPENDS:= +libncurses
+  DEPENDS:=+libncurses
  endef
  
  endef
  
-CONFIGURE_ARGS+= \
-       --enable-shared \
-       --enable-static \
-       --without-x \
-       --without-x11-driver \
-       --without-slang-driver \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --without-x \
+               --without-x11-driver \
+               --without-slang-driver \
+       )
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/libs/apr/Makefile b/libs/apr/Makefile

index ee454e7..506be46 100644 (file)
--- a/libs/apr/Makefile
+++ b/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_MD5SUM:=7138ac64d4458eeeaa9b9aefa4e6e51b
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -41,10 +42,6 @@ CONFIGURE_VARS += \
         apr_cv_tcp_nodelay_with_cork=yes \
         LDFLAGS="$$$$LDFLAGS -lpthread" \
  
         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 \
  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 \
diff --git a/libs/argtable/Makefile b/libs/argtable/Makefile

index 264a083..1564fa0 100644 (file)
--- a/libs/argtable/Makefile
+++ b/libs/argtable/Makefile
@@ -53,12 +53,6 @@ define Build/InstallDev
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libargtable2.{a,so*} $(1)/usr/lib/
  endef
  
         $(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/
  define Package/argtable/install
         $(INSTALL_DIR) $(1)/usr/lib
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libargtable2.so.* $(1)/usr/lib/
diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile

index f0a562b..3ca330d 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -17,7 +17,8 @@ PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e
  
  PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
  
  
  PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -42,7 +43,7 @@ define Package/libavahi
    $(call Package/avahi/Default)
    SECTION:=libs
    CATEGORY:=Libraries
    $(call Package/avahi/Default)
    SECTION:=libs
    CATEGORY:=Libraries
-  DEPENDS:=+libdaemon +libpthread
+  DEPENDS:=+libdaemon +libpthread +libgdbm
    TITLE+= (library)
  endef
  
    TITLE+= (library)
  endef
  
@@ -150,12 +151,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/
diff --git a/libs/bluez-libs/Makefile b/libs/bluez-libs/Makefile

index 8456e85..29cbeb8 100644 (file)
--- a/libs/bluez-libs/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/bluez-libs
@@ -30,12 +32,6 @@ CONFIGURE_ARGS += \
  
  TARGET_CFLAGS += $(FPIC)
  
  
  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
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/bluetooth
         $(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth
diff --git a/libs/classpath/Makefile b/libs/classpath/Makefile

index 0a43a5c..4b383ca 100644 (file)
--- a/libs/classpath/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/classpath
@@ -25,23 +27,20 @@ define Package/classpath
    MAINTAINER:=Roberto Riggio (roberto.riggio@create-net.org)
  endef
  
    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.
         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 
-
-CONFIGURE_ARGS+= \
-       --with-javac \
-       --enable-jni \
-       --disable-gtk-peer \
-       --disable-gconf-peer \
-       --disable-plugin \
-
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" \
-               CPPFLAGS="$(TARGET_CPPFLAGS)" \
-               all install
+endef
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --with-javac \
+               --enable-jni \
+               --disable-gtk-peer \
+               --disable-gconf-peer \
+               --disable-plugin \
+       )
  endef
  
  define Package/classpath/install
  endef
  
  define Package/classpath/install
diff --git a/libs/clinkc/Makefile b/libs/clinkc/Makefile

index 76de1ba..89b525d 100644 (file)
--- a/libs/clinkc/Makefile
+++ b/libs/clinkc/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=4c8ac54a15da47203a86daf77fbc2664
  PKG_BUILD_DIR:=$(BUILD_DIR)/CyberLinkC
  
  PKG_BUILD_DEPENDS:=libexpat
  PKG_BUILD_DIR:=$(BUILD_DIR)/CyberLinkC
  
  PKG_BUILD_DEPENDS:=libexpat
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -39,9 +40,7 @@ TARGET_CFLAGS += $(FPIC)
  
  define Build/Compile
         chmod +x $(PKG_BUILD_DIR)/config/install-sh
  
  define Build/Compile
         chmod +x $(PKG_BUILD_DIR)/config/install-sh
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       $(call Build/Compile/Default)
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/libs/db47/Makefile b/libs/db47/Makefile

index 655ae97..650fa2b 100644 (file)
--- a/libs/db47/Makefile
+++ b/libs/db47/Makefile
@@ -73,8 +73,6 @@ endef
  TARGET_CFLAGS += $(FPIC)
  
  define Build/Compile
  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
         $(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
                 DESTDIR="$(PKG_INSTALL_DIR)" install
  endef
diff --git a/libs/eventlog/Makefile b/libs/eventlog/Makefile

index 405b491..ac67b8a 100644 (file)
--- a/libs/eventlog/Makefile
+++ b/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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libeventlog
@@ -28,12 +30,6 @@ define Package/eventlog/description
    (local syslogd).
  endef
  
    (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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
diff --git a/libs/faad2/Makefile b/libs/faad2/Makefile

index b4170d6..ea666be 100644 (file)
--- a/libs/faad2/Makefile
+++ b/libs/faad2/Makefile
@@ -15,10 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/faac
  PKG_MD5SUM:=4c332fa23febc0e4648064685a3d4332
  
  PKG_SOURCE_URL:=@SF/faac
  PKG_MD5SUM:=4c332fa23febc0e4648064685a3d4332
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/faad2/Default
    URL:=http://www.audiocoding.com/faad2.html
    TITLE:=Freeware Advanced Audio Decoder
  define Package/faad2/Default
    URL:=http://www.audiocoding.com/faad2.html
    TITLE:=Freeware Advanced Audio Decoder
@@ -71,12 +74,6 @@ define Build/Configure
         )
  endef
  
         )
  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
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile

index df15ad5..dbf0213 100644 (file)
--- a/libs/fcgi/Makefile
+++ b/libs/fcgi/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.fastcgi.com/dist/
  PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e
  
  PKG_FIXUP:=libtool-ucxx
  PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e
  
  PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -44,10 +45,6 @@ CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
         LIBS="-nodefaultlibs -luClibc++ -lm" \
  
         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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/
diff --git a/libs/file/Makefile b/libs/file/Makefile

index 3423df0..f81eb0a 100644 (file)
--- a/libs/file/Makefile
+++ b/libs/file/Makefile
@@ -1,4 +1,4 @@
-# 
+#
  # Copyright (C) 2007 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # 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_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
  PKG_MD5SUM:=74cd5466416136da30a4e69f74dbc7a0
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libmagic
  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
   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
  
  endef
  
+MAKE_PATH:=src
+
  TARGET_CFLAGS += $(FPIC)
  
  TARGET_CFLAGS += $(FPIC)
  
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --disable-rpath \
-       --without-libiconv-prefix \
-       --without-libintl-prefix \
-
-MAKE_FLAGS += \
-       -C $(PKG_BUILD_DIR)/src \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install \
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --disable-rpath \
+               --without-libiconv-prefix \
+               --without-libintl-prefix \
+       )
+endef
  
  define Build/Prepare
         $(call Build/Prepare/Default)
  
  define Build/Prepare
         $(call Build/Prepare/Default)
diff --git a/libs/gd/Makefile b/libs/gd/Makefile

index 2ba3d29..77fbf0b 100644 (file)
--- a/libs/gd/Makefile
+++ b/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_SOURCE_URL:=http://www.libgd.org/releases
  PKG_MD5SUM:=6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -53,12 +54,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/
diff --git a/libs/glib/Makefile b/libs/glib/Makefile

index b791737..7b70180 100644 (file)
--- a/libs/glib/Makefile
+++ b/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
  
         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
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -36,6 +37,7 @@ define Package/glib1/description
  endef
  
  TARGET_CFLAGS += $(FPIC)
  endef
  
  TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
  
  CONFIGURE_ARGS += \
         --enable-shared \
  
  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" \
  
         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)/
  define Build/InstallDev
         $(INSTALL_DIR) $(1) $(2)/bin
         $(CP) $(PKG_INSTALL_DIR)/* $(1)/
diff --git a/libs/gsl/Makefile b/libs/gsl/Makefile

index c7bfc34..cd355b5 100644 (file)
--- a/libs/gsl/Makefile
+++ b/libs/gsl/Makefile
@@ -1,4 +1,4 @@
-# 
+#
  # Copyright (C) 2008 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # 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_MD5SUM:=81dca4362ae8d2aa1547b7d010881e43
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -35,15 +36,6 @@ endef
  
  TARGET_CFLAGS += $(FPIC)
  
  
  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/
  define Package/libgsl/install
         $(INSTALL_DIR) $(1)/usr/lib
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsl.so* $(1)/usr/lib/
diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile

index 3b8c67c..916105d 100644 (file)
--- a/libs/gsm/Makefile
+++ b/libs/gsm/Makefile
@@ -63,8 +63,6 @@ endef
  TARGET_CFLAGS += $(FPIC)
  
  define Build/Compile
  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)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 LD="$(TARGET_CC)" \
diff --git a/libs/howl/Makefile b/libs/howl/Makefile

index 961760a..08a23d7 100644 (file)
--- a/libs/howl/Makefile
+++ b/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.
  #
  # 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_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_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
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/howl/Default
    SECTION:=net
    CATEGORY:=Network
  define Package/howl/Default
    SECTION:=net
    CATEGORY:=Network
@@ -89,14 +93,6 @@ define Build/Configure
         );
  endef
  
         );
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(1)/usr/include/
diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile

index 04d2aae..28662d8 100644 (file)
--- a/libs/id3lib/Makefile
+++ b/libs/id3lib/Makefile
@@ -1,4 +1,4 @@
-# 
+#
  # Copyright (C) 2006 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # 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_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
  
  PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -31,16 +32,12 @@ TARGET_CFLAGS += $(FPIC)
  
  CONFIGURE_ARGS += \
         --enable-shared \
  
  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" \
  
         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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(1)/usr/include/
diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile

index 725e404..b4ad912 100644 (file)
--- a/libs/iksemel/Makefile
+++ b/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_SOURCE_URL:=http://iksemel.googlecode.com/files/
  PKG_MD5SUM:=532e77181694f87ad5eb59435d11c1ca
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -35,17 +36,18 @@ define Package/libiksemel/description
  endef
  
  TARGET_CFLAGS += $(FPIC)
  endef
  
  TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += \
+       -Wl,-rpath-link,$(STAGING_DIR)/usr/lib \
+       -lgnutls -lgcrypt -lgpg-error
  
  
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --with-libgnutls-prefix="$(STAGING_DIR)/usr" \
-
-CONFIGURE_VARS += \
-       LIBS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -lgnutls -lgcrypt -lgpg-error" \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --with-libgnutls-prefix="$(STAGING_DIR)/usr" \
+               , \
+               LIBS="$(TARGET_LDFLAGS)" \
+       )
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile

index c741118..4328651 100644 (file)
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -62,8 +62,7 @@ define Build/Prepare
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
+       $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 LIBTOOL="./libtool --tag=CC" \
                 prefix="$(PKG_INSTALL_DIR)/usr" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 LIBTOOL="./libtool --tag=CC" \
                 prefix="$(PKG_INSTALL_DIR)/usr" \
diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile

index d8cc4fd..ea4891d 100644 (file)
--- a/libs/libaio/Makefile
+++ b/libs/libaio/Makefile
@@ -28,7 +28,7 @@ endef
  define Build/Configure
  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)
  
  
  TARGET_CFLAGS += $(FPIC)
  
diff --git a/libs/libao/Makefile b/libs/libao/Makefile

index a448e25..463a190 100644 (file)
--- a/libs/libao/Makefile
+++ b/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_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
  PKG_MD5SUM:=b92cba3cbcf1ee9bc221118a85d23dcd
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libao
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libao
@@ -40,12 +42,6 @@ CONFIGURE_ARGS += \
  
  TARGET_CFLAGS += $(FPIC)
  
  
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/
diff --git a/libs/libatomicops/Makefile b/libs/libatomicops/Makefile

index a0d3ca3..b82d940 100644 (file)
--- a/libs/libatomicops/Makefile
+++ b/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.
  #
  # 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_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/
  
  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_BUILD_DIR:=$(BUILD_DIR)/libatomic_ops-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libatomicops
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libatomicops
@@ -44,12 +46,6 @@ CONFIGURE_ARGS += \
         --enable-shared \
         --enable-static \
  
         --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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/
         $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/libs/libcelt/Makefile b/libs/libcelt/Makefile

index a59592e..f29ccdd 100644 (file)
--- a/libs/libcelt/Makefile
+++ b/libs/libcelt/Makefile
@@ -1,4 +1,4 @@
-# 
+#
  # Copyright (C) 2009 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # 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_DIR:=$(BUILD_DIR)/celt-$(PKG_VERSION)
  PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/celt/
  PKG_MD5SUM:=0bb72abec367f4ef12551f79dda11b23
+
  PKG_BUILD_DEPENDS:=libogg
  PKG_BUILD_DEPENDS:=libogg
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  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
  
   The CELT codec is an experimental audio codec for use in low-delay speech and audio communication.
  endef
  
-CONFIGURE_ARGS += \
-       --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
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --without-ogg \
+       )
  endef
  
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/celt
  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
                 $(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
  
                 $(1)/usr/lib/
  endef
  
diff --git a/libs/libcrypto++/Makefile b/libs/libcrypto++/Makefile

index d98764d..219c439 100644 (file)
--- a/libs/libcrypto++/Makefile
+++ b/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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libcryptoxx
@@ -41,13 +43,6 @@ define Build/Configure
         )
  endef
  
         )
  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++/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/crypto++
         $(CP) $(PKG_INSTALL_DIR)/usr/include/crypto--/* $(1)/usr/include/crypto++/
diff --git a/libs/libdaemon/Makefile b/libs/libdaemon/Makefile

index b72449d..4fa591f 100644 (file)
--- a/libs/libdaemon/Makefile
+++ b/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_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
  PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libdaemon
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libdaemon
@@ -47,12 +49,6 @@ endef
  
  TARGET_CFLAGS += $(FPIC)
  
  
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/
diff --git a/libs/libdbi/Makefile b/libs/libdbi/Makefile

index f0d2ebf..badd7e9 100644 (file)
--- a/libs/libdbi/Makefile
+++ b/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.
  #
  # 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_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_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
  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
  
         (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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/dbi $(1)/usr/include/
diff --git a/libs/libdmapsharing/Makefile b/libs/libdmapsharing/Makefile

index 3835939..1739e7d 100644 (file)
--- a/libs/libdmapsharing/Makefile
+++ b/libs/libdmapsharing/Makefile
@@ -19,12 +19,14 @@ PKG_MD5SUM:=11839bcf9aac8f1de5e101d13e9e8422
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION)
  
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
-EXTRA_CFLAGS+= \
+TARGET_CFLAGS+= \
         -I$(STAGING_DIR)/usr/lib/libintl/include
  
         -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
  
         -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
  
    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) \
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/
         $(CP) \
diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile

index b738989..ec9d1b0 100644 (file)
--- a/libs/libdnet/Makefile
+++ b/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.
  #
  # 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_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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d
+
  PKG_FIXUP:=libtool
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -59,10 +61,6 @@ CONFIGURE_ARGS += \
  CONFIGURE_VARS += \
         ac_cv_dnet_bsd_bpf=no
  
  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) \
  define Build/InstallDev
         $(INSTALL_DIR) $(2)/bin
         $(INSTALL_BIN) \
diff --git a/libs/libffi-sable/Makefile b/libs/libffi-sable/Makefile

index 88c2c81..fdb823a 100644 (file)
--- a/libs/libffi-sable/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libffi-sable
@@ -42,20 +44,14 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Build/InstallDev        
+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
  
         $(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
         $(INSTALL_DIR) $(1)/usr/lib
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/
  endef
diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile

index b6719e7..ff0ff28 100644 (file)
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
  PKG_MD5SUM:=34105aa927e23c217741966496b97e67
  
  PKG_FIXUP:=libtool
  PKG_MD5SUM:=34105aa927e23c217741966496b97e67
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -49,12 +50,6 @@ CONFIGURE_ARGS+= \
         --enable-ciphers="arcfour des aes" \
         --enable-pubkey-ciphers="rsa dsa" \
  
         --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/
  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/
diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile

index ba1ad20..15946c8 100644 (file)
--- a/libs/libid3tag/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libid3tag
@@ -41,12 +43,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(1)/usr/include/
diff --git a/libs/libjson-c/Makefile b/libs/libjson-c/Makefile

index 2e8b96d..6c5907a 100644 (file)
--- a/libs/libjson-c/Makefile
+++ b/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_SOURCE_URL:=http://oss.metaparadigm.com/json-c/
  PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libjson
    SECTION:=libs
    CATEGORY:=Libraries
  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
  
   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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile

index d38a5d3..318519c 100644 (file)
--- a/libs/libmad/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  FPM:=default
@@ -45,17 +47,15 @@ endef
  
  TARGET_CFLAGS += $(FPIC)
  
  
  TARGET_CFLAGS += $(FPIC)
  
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --enable-fpm="$(FPM)" \
-       --disable-debugging \
-       --enable-speed \
-
-MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS)" \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --enable-fpm="$(FPM)" \
+               --disable-debugging \
+               --enable-speed \
+       )
+endef
  
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
  
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile

index 1856b22..78ee03a 100644 (file)
--- a/libs/libmcrypt/Makefile
+++ b/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.
  #
  # 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_SOURCE_URL:=@SF/mcrypt
  PKG_MD5SUM:=c4f491dd411a09e9de3b8702ea6f73eb
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libmcrypt
    SECTION:=libs
    CATEGORY:=Libraries
  define Package/libmcrypt
    SECTION:=libs
    CATEGORY:=Libraries
@@ -36,14 +40,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/libs/libmms/Makefile b/libs/libmms/Makefile

index c86f6e6..d72a9e7 100644 (file)
--- a/libs/libmms/Makefile
+++ b/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.
  #
  # 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_SOURCE_URL:=http://code.launchpad.net/libmms/trunk/$(PKG_VERSION)/+download/
  PKG_MD5SUM:=cf83053ec891f14e73a04c84d9de08ee
  
-PKG_FIXUP:= libtool
-PKG_INSTALL:= 1
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -42,12 +42,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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/
  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
  
         $(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/
  define Package/libmms/install
         $(INSTALL_DIR) $(1)/usr/lib
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.so.* $(1)/usr/lib/
diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile

index 147412f..64da2a4 100644 (file)
--- a/libs/libmpd/Makefile
+++ b/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_SOURCE_URL:=http://download.sarine.nl/Programs/gmpc/$(PKG_VERSION)/
  PKG_MD5SUM:=a994f5f25a22c778926a3684c3e3050d
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
+
  define Package/libmpd
    SECTION:=libs
    CATEGORY:=Libraries
  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
  
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd-1.0 $(1)/usr/include/
diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile

index f8b29e8..e1ca72d 100644 (file)
--- a/libs/libnet-1.0.x/Makefile
+++ b/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_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -55,14 +56,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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/
  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/
diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile

index 284caf0..5ddb6e6 100644 (file)
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
  
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libnet1
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libnet1
@@ -55,14 +57,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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/
  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/
diff --git a/libs/libnfnetlink/Makefile b/libs/libnfnetlink/Makefile

index a45d40c..19d34a0 100644 (file)
--- a/libs/libnfnetlink/Makefile
+++ b/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
  
         http://mirrors.evolva.ro/netfilter.org/libnfnetlink/
  PKG_MD5SUM:=016fdec8389242615024c529acc1adb8
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libnfnetlink
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libnfnetlink
@@ -39,13 +41,6 @@ CONFIGURE_ARGS += \
         --enable-static \
         --enable-shared
  
         --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) \
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/libnfnetlink
         $(CP) \
diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile

index 6cd35d3..1f22ac0 100644 (file)
--- a/libs/libosip2/Makefile
+++ b/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.
  #
  # 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_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_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
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -33,17 +34,16 @@ endef
  
  TARGET_CFLAGS += $(FPIC)
  
  
  TARGET_CFLAGS += $(FPIC)
  
-CONFIGURE_ARGS+= \
-       --enable-shared \
-       --enable-static \
-       --disable-debug \
-       --disable-trace \
-       --enable-pthread \
-       --enable-semaphore \
-       --enable-ntimer \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --disable-debug \
+               --disable-trace \
+               --enable-pthread \
+               --enable-semaphore \
+               --enable-ntimer \
+       )
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/libs/libpar2/Makefile b/libs/libpar2/Makefile

index 841d13a..1c71d73 100644 (file)
--- a/libs/libpar2/Makefile
+++ b/libs/libpar2/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/parchive
  PKG_MD5SUM:=94c6df4e38efe08056ecde2a04e0be91
  
  PKG_FIXUP:=libtool
  PKG_MD5SUM:=94c6df4e38efe08056ecde2a04e0be91
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -34,14 +35,6 @@ CONFIGURE_ARGS += \
         --disable-static \
         --disable-nls \
  
         --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) \
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/libpar2
         $(INSTALL_DATA) \
diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile

index de19497..753d2ed 100644 (file)
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@@ -15,11 +15,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/libpng
  PKG_MD5SUM:=2faa7f8d81e6a35beb991cb75edbf056
  
  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
  
  
  include $(INCLUDE_DIR)/host-build.mk
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libpng
    SECTION:=libs
    CATEGORY:=Libraries
  define Package/libpng
    SECTION:=libs
    CATEGORY:=Libraries
@@ -36,18 +39,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(2)/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/
diff --git a/libs/librsync/Makefile b/libs/librsync/Makefile

index 677d249..3588904 100644 (file)
--- a/libs/librsync/Makefile
+++ b/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.
  #
  # 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_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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/librsync
  PKG_MD5SUM:=24cdb6b78f45e0e83766903fd4f6bc84
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/librsync
    SECTION:=libs
    CATEGORY:=Libraries
  define Package/librsync
    SECTION:=libs
    CATEGORY:=Libraries
@@ -38,14 +42,6 @@ define Build/Configure
         );
  endef
  
         );
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/librsync{,-config}.h $(1)/usr/include/
diff --git a/libs/libsamplerate/Makefile b/libs/libsamplerate/Makefile

index 34bc146..c54d590 100644 (file)
--- a/libs/libsamplerate/Makefile
+++ b/libs/libsamplerate/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/
  PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f
  
  PKG_FIXUP:=libtool
  PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -37,12 +38,6 @@ TARGET_CFLAGS += $(FPIC)
  CONFIGURE_ARGS += \
         --disable-fftw \
  
  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)/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)/
diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile

index a3ac2ff..dd153ce 100644 (file)
--- a/libs/libshout/Makefile
+++ b/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_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
  
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libshout
    SECTION:=libs
    DEPENDS:=+libvorbisidec
  define Package/libshout
    SECTION:=libs
    DEPENDS:=+libvorbisidec
@@ -44,14 +47,6 @@ define Build/Configure
         )
  endef
  
         )
  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
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/shout
         $(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout
diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile

index 2914b29..5c53c18 100644 (file)
--- a/libs/libsndfile/Makefile
+++ b/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.
  #
  # 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_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_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
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -34,15 +35,13 @@ endef
  
  TARGET_CFLAGS += $(FPIC)
  
  
  TARGET_CFLAGS += $(FPIC)
  
-CONFIGURE_ARGS += \
-       --disable-alsa \
-       --disable-external-libs \
-       --disable-sqlite \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-alsa \
+               --disable-external-libs \
+               --disable-sqlite \
+               --disable-shave \
+       )
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/libs/libsynce/Makefile b/libs/libsynce/Makefile

index a11a283..b9a5da5 100644 (file)
--- a/libs/libsynce/Makefile
+++ b/libs/libsynce/Makefile
@@ -1,4 +1,4 @@
-# 
+#
  # Copyright (C) 2008 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # Copyright (C) 2008 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile

index 3eccbdf..d8f5938 100644 (file)
--- a/libs/libtasn1/Makefile
+++ b/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
  
         http://josefsson.org/gnutls/releases/libtasn1/
  PKG_MD5SUM:=a733ecdfed3517910e627d24e050979f
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -41,10 +42,6 @@ CONFIGURE_ARGS += \
                 --enable-shared \
                 --enable-static
  
                 --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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(1)/usr/bin/
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile

index 71e345a..81aa97f 100644 (file)
--- a/libs/libtorrent/Makefile
+++ b/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_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
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/libtorrent
diff --git a/libs/libtwin/Makefile b/libs/libtwin/Makefile

index 2a85ced..91b66d5 100644 (file)
--- a/libs/libtwin/Makefile
+++ b/libs/libtwin/Makefile
@@ -59,10 +59,6 @@ define Build/InstallDev
                 $(1)/usr/lib/pkgconfig/
  endef
  
                 $(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) \
  define Package/libtwin/install
         $(INSTALL_DIR) $(1)/usr/lib
         $(INSTALL_BIN) \
diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile

index bde3511..8914232 100644 (file)
--- a/libs/libvorbisidec/Makefile
+++ b/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_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
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -43,12 +44,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(1)/usr/include/
diff --git a/libs/libyaml/Makefile b/libs/libyaml/Makefile

index 8e490af..45e6a24 100644 (file)
--- a/libs/libyaml/Makefile
+++ b/libs/libyaml/Makefile
@@ -19,6 +19,8 @@ PKG_FIXUP:=libtool
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libyaml
    SUBMENU:=Python
    SECTION:=lang
  define Package/libyaml
    SUBMENU:=Python
    SECTION:=lang
diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile

index 279f595..59a8637 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -68,8 +68,6 @@ endef
  TARGET_CFLAGS += $(FPIC)
  
  define Build/Compile
  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)" \
         $(MAKE) -C "$(PKG_BUILD_DIR)" \
                 SUBDIRS="include" \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/libs/popt/Makefile b/libs/popt/Makefile

index 4f22390..34e4b25 100644 (file)
--- a/libs/popt/Makefile
+++ b/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_SOURCE_URL:=http://downloads.openwrt.org/sources/
  PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/libpopt
    SECTION:=libs
    CATEGORY:=Libraries
  define Package/libpopt
    SECTION:=libs
    CATEGORY:=Libraries
@@ -31,14 +35,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(1)/usr/include/
diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile

index 5fc6ea0..758d2a3 100644 (file)
--- a/libs/rrdtool-1.0.x/Makefile
+++ b/libs/rrdtool-1.0.x/Makefile
@@ -99,8 +99,6 @@ CONFIGURE_VARS += \
         shrext_cmds=".so"
  
  define Build/Compile
         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" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
                 shrext_cmds=".so" \
diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile

index defce43..2801a6c 100644 (file)
--- a/libs/sqlite2/Makefile
+++ b/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.
  #
  # 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_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
  
  PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS += $(FPIC)
+
  define Package/sqlite2/Default
    SUBMENU:=database
    TITLE:=SQLite (v2.x) database engine
  define Package/sqlite2/Default
    SUBMENU:=database
    TITLE:=SQLite (v2.x) database engine
@@ -35,7 +38,6 @@ define Package/libsqlite2
  endef
  
  define Package/libsqlite2/description
  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.
         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
  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 
         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
  
         )
  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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(1)/usr/include/
diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile

index b3b13f2..2770a85 100644 (file)
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.sqlite.org/
  PKG_MD5SUM:=4bb3e9ee5d25e88b8ff8533fbeb168aa
  
  PKG_BUILD_DEPENDS:=libncurses libreadline
  PKG_MD5SUM:=4bb3e9ee5d25e88b8ff8533fbeb168aa
  
  PKG_BUILD_DEPENDS:=libncurses libreadline
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  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" \
  
         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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/
diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile

index 6be909b..f467e97 100644 (file)
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -41,8 +41,6 @@ endef
  TARGET_CFLAGS += $(FPIC)
  
  define Build/Compile
  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)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 CROSS="$(TARGET_CROSS)" \
                 OPTFLAGS="$(TARGET_CFLAGS)" \
diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile

index 1913f4e..1136c9f 100644 (file)
--- a/libs/wxbase/Makefile
+++ b/libs/wxbase/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
  
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libwxbase
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libwxbase
@@ -113,12 +115,6 @@ else
    LIB_PFX:=
  endif
  
    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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
         $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/
diff --git a/multimedia/gst-plugins-good/Makefile b/multimedia/gst-plugins-good/Makefile

index 86fb2cb..a43d4d4 100644 (file)
--- a/multimedia/gst-plugins-good/Makefile
+++ b/multimedia/gst-plugins-good/Makefile
@@ -82,7 +82,7 @@ define Build/Configure
                 --disable-sunaudio \
                 --without-x \
         )
                 --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
         touch $(PKG_BUILD_DIR)/bin/gtkdoc-rebase
         chmod +x $(PKG_BUILD_DIR)/bin/gtkdoc-rebase
  endef
diff --git a/multimedia/hasciicam/Makefile b/multimedia/hasciicam/Makefile

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

index 98b4b5a..867333f 100644 (file)
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \
                 @SF/motion
  PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037
  
                 @SF/motion
  PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/motion
  include $(INCLUDE_DIR)/package.mk
  
  define Package/motion
@@ -36,12 +38,6 @@ CONFIGURE_ARGS+= \
         --without-mysql \
         --without-pgsql \
  
         --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
  define Package/motion/install
         $(INSTALL_DIR) $(1)/etc
         $(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf
diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile

index 4cba497..751f77b 100644 (file)
--- a/multimedia/peercast/Makefile
+++ b/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.
  #
  # 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_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_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
  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" \
  
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
         LIBS="-nodefaultlibs -luClibc++ -lpthread" \
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/peercast/install        
+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
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/usr/share/peercast/html
diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile

index 38e4e44..9a2837a 100644 (file)
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@@ -33,8 +33,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  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" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \
diff --git a/net/aircrack-ptw/Makefile b/net/aircrack-ptw/Makefile

index f918d89..5dacde1 100644 (file)
--- a/net/aircrack-ptw/Makefile
+++ b/net/aircrack-ptw/Makefile
@@ -30,8 +30,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  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 \
         $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
                 $(TARGET_LDFLAGS) \
                 -lpcap -o $(PKG_BUILD_DIR)/aircrack-ptw \
diff --git a/net/amwall/Makefile b/net/amwall/Makefile

index ac9d1cc..8c415d1 100644 (file)
--- a/net/amwall/Makefile
+++ b/net/amwall/Makefile
@@ -27,8 +27,6 @@ define Package/amwall
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 V= \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 V= \
diff --git a/net/apache/Makefile b/net/apache/Makefile

index 543db24..8ce9310 100644 (file)
--- a/net/apache/Makefile
+++ b/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.
  #
  # 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_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
  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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/apache/Default
  include $(INCLUDE_DIR)/package.mk
  
  define Package/apache/Default
@@ -103,12 +105,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Build/InstallDev
         rm -rf  $(PKG_INSTALL_DIR)/usr/man/ \
                 $(PKG_INSTALL_DIR)/usr/share/manual/
diff --git a/net/appweb/Makefile b/net/appweb/Makefile

index 442e59e..7331499 100644 (file)
--- a/net/appweb/Makefile
+++ b/net/appweb/Makefile
@@ -49,8 +49,6 @@ define Package/appweb/description
  endef
  
  define Build/Prepare
  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
  
         tar xzf "$(DL_DIR)/$(PKG_SOURCE)" --strip-components 1 -C "$(PKG_BUILD_DIR)"
  endef
  
diff --git a/net/arpd/Makefile b/net/arpd/Makefile

index 8cf7327..49abe30 100644 (file)
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
  define Package/arpd
    SECTION:=net
    CATEGORY:=Network
  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
    TITLE:=A daemon to fake ARP replies
    URL:=http://niels.xtdnet.nl/honeyd/
  endef
diff --git a/net/bind/Makefile b/net/bind/Makefile

index b843732..82edabb 100644 (file)
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -90,8 +90,6 @@ CONFIGURE_ARGS += \
                 BUILD_CC="$(TARGET_CC)" \
  
  define Build/Compile
                 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)" \
         $(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
                 BUILD_CC="$(HOSTCC)" \
                 CC="$(HOSTCC)" \
diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile

index e8bcae4..9857bee 100644 (file)
--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@@ -31,8 +31,6 @@ define Package/bitchx
  endef
  
  define Build/Compile
  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)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile

index f83a040..95cceb6 100644 (file)
--- a/net/chillispot/Makefile
+++ b/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.
  #
  # 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_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_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
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -43,12 +44,6 @@ endef
  
  # uses GNU configure
  
  
  # 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
  define Package/chillispot/install
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli
diff --git a/net/click/Makefile b/net/click/Makefile

index e380e84..640cbd8 100644 (file)
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -76,8 +76,6 @@ endef
  
  
  define Build/Compile
  
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
         $(CONF_OPTS) \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(BUILDOPTS) \
         $(CONF_OPTS) \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(BUILDOPTS) \
diff --git a/net/cups/Makefile b/net/cups/Makefile

index a50ff78..8732235 100644 (file)
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -67,8 +67,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  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)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 DSTROOT="$(PKG_INSTALL_DIR)" \
diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile

index 3c32010..a969e0c 100644 (file)
--- a/net/dansguardian/Makefile
+++ b/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_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable
  PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dansguardian
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dansguardian
@@ -46,12 +48,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Package/dansguardian/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/
diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile

index 3abc3b4..14a0d7c 100644 (file)
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -39,7 +39,6 @@ CONFIGURE_ARGS += \
         --with-chroot-dir /var/empty
  
  define Build/Compile
         --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) \
         $(HOSTCC) $(PKG_BUILD_DIR)/static/c-ify.c \
                 -o $(PKG_BUILD_DIR)/c-ify
         $(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile

index 9eba08d..467148a 100644 (file)
--- a/net/dhcpcd/Makefile
+++ b/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_SOURCE_URL:=http://download.berlios.de/dhcpcd/
  PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dhcpcd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dhcpcd
@@ -29,14 +31,6 @@ define Package/dhcpcd/description
         IP address changes.
  endef
  
         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/
  define Package/dhcpcd/install
         $(INSTALL_DIR) $(1)/sbin
         $(CP) $(PKG_INSTALL_DIR)/sbin/* $(1)/sbin/
diff --git a/net/dircproxy/Makefile b/net/dircproxy/Makefile

index aca28b4..6896637 100644 (file)
--- a/net/dircproxy/Makefile
+++ b/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_SOURCE_URL:=http://dircproxy.googlecode.com/files/
  PKG_MD5SUM:=4fe2e82619c7b575599bfb236adbd872
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dircproxy
  include $(INCLUDE_DIR)/package.mk
  
  define Package/dircproxy
@@ -27,12 +29,6 @@ endef
  
  # uses Build/Configure/Default
  
  
  # 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/
  define Package/dircproxy/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/
diff --git a/net/ekg/Makefile b/net/ekg/Makefile

index ff15808..40d36d3 100644 (file)
--- a/net/ekg/Makefile
+++ b/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.
  #
  # 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_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_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
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ekg
@@ -39,12 +41,6 @@ CONFIGURE_VARS+= \
         CFLAGS="$$$$CFLAGS $(TARGET_CPPFLAGS)" \
         CFLAGS_LIBGADU="$$$$CFLAGS $(TARGET_CPPFLAGS)" \
  
         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/
  define Package/ekg/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(CP) $(PKG_INSTALL_DIR)/usr/bin/ekg $(1)/usr/bin/
diff --git a/net/faifa/Makefile b/net/faifa/Makefile

index 11c6591..d0b60ad 100644 (file)
--- a/net/faifa/Makefile
+++ b/net/faifa/Makefile
@@ -41,8 +41,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  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)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) -DSVN_REV=$(PKG_REV) $(TARGET_CPPFLAGS)" \
diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile

index 21f0ddd..5c4d3f6 100644 (file)
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -16,8 +16,9 @@ PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
  PKG_MD5SUM:=a23c728b8734c542d559c485857238d2
  
  PKG_FIXUP:=libtool-ucxx
  PKG_MD5SUM:=a23c728b8734c542d559c485857238d2
  
  PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
  
  
-PKG_BUILD_DEPENDS=libncurses
+PKG_BUILD_DEPENDS:=libncurses
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -49,12 +50,6 @@ CONFIGURE_VARS += \
         LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
         CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
  
         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/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/
diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile

index eeb4b17..125cce0 100644 (file)
--- a/net/ipcad/Makefile
+++ b/net/ipcad/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/ipcad
  PKG_MD5SUM:=125605249958894148ec26d3c88189f5
  
  PKG_SOURCE_URL:=@SF/ipcad
  PKG_MD5SUM:=125605249958894148ec26d3c88189f5
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ipcad
  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 \
  
         ac_cv_header_linux_netfilter_ipv4_ip_queue_h=no \
         ac_cv_header_linux_netfilter_ipv4_ipt_ULOG_h=no \
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/ipcad/install   
+define Package/ipcad/install
         $(INSTALL_DIR) $(1)/etc
         $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_DIR) $(1)/etc
         $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/usr/bin
diff --git a/net/ipkungfu/Makefile b/net/ipkungfu/Makefile

index e7275ed..8612b0e 100644 (file)
--- a/net/ipkungfu/Makefile
+++ b/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_SOURCE_URL:=http://www.linuxkungfu.org/ipkungfu
  PKG_MD5SUM:=89f6bc0df356dd4ee650882c54ec9074
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ipkungfu
  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" \
  
                  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/
  define Package/ipkungfu/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/dummy_server $(1)/usr/sbin/
diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile

index 386a8b9..7b0577e 100644 (file)
--- a/net/ipsec-tools/Makefile
+++ b/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_SOURCE_URL:=@SF/ipsec-tools
  PKG_MD5SUM:=821bd84e8d4ad5a93bf594b8b3d66e1e
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ipsec-tools
  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
  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
  
  define Package/ipsec-tools/install
         $(INSTALL_DIR) $(1)/etc
diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile

index 6fc1790..ceb49c2 100644 (file)
--- a/net/keepalived/Makefile
+++ b/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
         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" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
                 STRIP="/bin/true" \
diff --git a/net/krb5/Makefile b/net/krb5/Makefile

index ff3d252..10753f9 100644 (file)
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -10,8 +10,12 @@ PKG_MD5SUM:=9f7b3402b4731a7fa543db193bf1b564
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
  
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+MAKE_PATH:=src
+
  define Package/krb5/Default
         SECTION:=net
         CATAGORY:=Network
  define Package/krb5/Default
         SECTION:=net
         CATAGORY:=Network
@@ -83,16 +87,6 @@ define Build/Configure
         $(call Build/Configure/Default)
  endef
  
         $(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
  define Package/krb5-libs/install
         $(INSTALL_DIR) $(1)/usr/lib
         $(INSTALL_DIR) $(1)/usr/lib/krb5
diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile

index a277889..819f1aa 100644 (file)
--- a/net/matrixtunnel/Makefile
+++ b/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.
  #
  # 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_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
  
  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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+MAKE_PATH:=src
+
  define Package/matrixtunnel
    SECTION:=net
    CATEGORY:=Network
  define Package/matrixtunnel
    SECTION:=net
    CATEGORY:=Network
@@ -41,12 +45,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Package/matrixtunnel/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/
diff --git a/net/miau/Makefile b/net/miau/Makefile

index bb7c966..8ab8583 100644 (file)
--- a/net/miau/Makefile
+++ b/net/miau/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/miau
  PKG_MD5SUM:=cbce4182d66430a965a5fff26738ce3f
  
  PKG_SOURCE_URL:=@SF/miau
  PKG_MD5SUM:=cbce4182d66430a965a5fff26738ce3f
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/miau
  include $(INCLUDE_DIR)/package.mk
  
  define Package/miau
@@ -39,12 +41,8 @@ CONFIGURE_ARGS += \
         --enable-privlog \
         --enable-onconnect
  
         --enable-privlog \
         --enable-onconnect
  
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
-
-define Package/miau/install    
-       $(INSTALL_DIR) $(1)/usr/bin     
+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
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_DIR) $(1)/etc/default
diff --git a/net/mtr/Makefile b/net/mtr/Makefile

index 4505b60..06940e3 100644 (file)
--- a/net/mtr/Makefile
+++ b/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_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr/
  PKG_MD5SUM:=23baca52d0922c2ecba7eba05317868c
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/mtr
  include $(INCLUDE_DIR)/package.mk
  
  define Package/mtr
@@ -53,12 +55,6 @@ define Build/Configure
         )
  endef
  
         )
  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/
  define Package/mtr/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/
diff --git a/net/mutella/Makefile b/net/mutella/Makefile

index eb82d41..afe95b6 100644 (file)
--- a/net/mutella/Makefile
+++ b/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.
  #
  # 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_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_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
  
  
  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
  
         $(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/
  define Package/mutella/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutella{,_sio} $(1)/usr/bin/
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile

index 5789043..e0a7c84 100644 (file)
--- a/net/nagios-plugins/Makefile
+++ b/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_SOURCE_URL:=@SF/nagiosplug
  PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  comma:= ,
  include $(INCLUDE_DIR)/package.mk
  
  comma:= ,
@@ -41,12 +43,6 @@ CONFIGURE_ARGS += \
         --with-ssh-command="/usr/bin/ssh" \
         --with-nslookup-command="/usr/bin/nslookup"
  
         --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/
  define Package/nagios-plugins/install
         $(INSTALL_DIR) $(1)/usr/libexec/nagios
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/
diff --git a/net/natpmp/Makefile b/net/natpmp/Makefile

index 91d20c2..00d764a 100644 (file)
--- a/net/natpmp/Makefile
+++ b/net/natpmp/Makefile
@@ -27,7 +27,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CC="$(TARGET_CC)" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CC="$(TARGET_CC)" \
diff --git a/net/netcat/Makefile b/net/netcat/Makefile

index 19906cc..b2e95ca 100644 (file)
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -8,6 +8,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=0a29eff1736ddb5effd0b1ec1f6fe0ef
  
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=0a29eff1736ddb5effd0b1ec1f6fe0ef
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/netcat
  include $(INCLUDE_DIR)/package.mk
  
  define Package/netcat
@@ -29,12 +31,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-       all install
-endef
-
  define Package/netcat/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/netcat \
  define Package/netcat/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/netcat \
diff --git a/net/netdiscover/Makefile b/net/netdiscover/Makefile

index e70ec59..1d89cd2 100644 (file)
--- a/net/netdiscover/Makefile
+++ b/net/netdiscover/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://nixgeneration.com/~jaime/netdiscover/releases/
  PKG_MD5SUM:=0919227a91ecaeeb2443cff249417be2
  
  PKG_SOURCE_URL:=http://nixgeneration.com/~jaime/netdiscover/releases/
  PKG_MD5SUM:=0919227a91ecaeeb2443cff249417be2
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/netdiscover
  include $(INCLUDE_DIR)/package.mk
  
  define Package/netdiscover
@@ -29,12 +31,6 @@ CONFIGURE_VARS+= \
         CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include" \
         LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib" \
  
         CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include" \
         LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib" \
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/netdiscover/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdiscover $(1)/usr/sbin/
  define Package/netdiscover/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdiscover $(1)/usr/sbin/
diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile

index c41d539..5aea648 100644 (file)
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=ftp://ngircd.barton.de/pub/ngircd/
  PKG_MD5SUM:=c183a85eba6fe51255983848f099c8ae
  
  PKG_SOURCE_URL:=ftp://ngircd.barton.de/pub/ngircd/
  PKG_MD5SUM:=c183a85eba6fe51255983848f099c8ae
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ngircd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ngircd
@@ -36,16 +38,6 @@ define Package/ngircd/conffiles
  /etc/ngircd.conf
  endef
  
  /etc/ngircd.conf
  endef
  
-define Build/Configure
-       $(call Build/Configure/Default)
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/ngircd/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ngircd $(1)/usr/sbin/
  define Package/ngircd/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ngircd $(1)/usr/sbin/
diff --git a/net/nmap/Makefile b/net/nmap/Makefile

index 4015b79..3c7790f 100644 (file)
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
  PKG_MD5SUM:=ea50419f99472200c4184a304e3831ea
  
  PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
  PKG_MD5SUM:=ea50419f99472200c4184a304e3831ea
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/nmap
  include $(INCLUDE_DIR)/package.mk
  
  define Package/nmap
@@ -41,13 +43,7 @@ CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
         LIBS="-nodefaultlibs -luClibc++ -lgcc" \
  
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
         LIBS="-nodefaultlibs -luClibc++ -lgcc" \
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/nmap/install    
+define Package/nmap/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/share/nmap
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/share/nmap
diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile

index baed640..83d9b00 100644 (file)
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION)
  
  
  PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION)
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/nocatsplash
  include $(INCLUDE_DIR)/package.mk
  
  define Package/nocatsplash
@@ -48,16 +50,9 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/nocatsplash/install     
+define Package/nocatsplash/install
         $(INSTALL_DIR) $(1)
         $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
  endef
  
  $(eval $(call BuildPackage,nocatsplash))
  endef
  
  $(eval $(call BuildPackage,nocatsplash))
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile

index 0cdee21..1c7b274 100644 (file)
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -110,8 +110,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
         $(MAKE) -C "$(PKG_BUILD_DIR)" \
                 $(TARGET_CONFIGURE_OPTS) \
                 NODEBUG=1 \
         $(MAKE) -C "$(PKG_BUILD_DIR)" \
                 $(TARGET_CONFIGURE_OPTS) \
                 NODEBUG=1 \
diff --git a/net/opendchub/Makefile b/net/opendchub/Makefile

index cc4a3f3..db4e7c6 100644 (file)
--- a/net/opendchub/Makefile
+++ b/net/opendchub/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/opendchub
  PKG_MD5SUM:=8f9ab5bb7f85730f4b1ce7cceb6aef96
  
  PKG_SOURCE_URL:=@SF/opendchub
  PKG_MD5SUM:=8f9ab5bb7f85730f4b1ce7cceb6aef96
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/opendchub
  include $(INCLUDE_DIR)/package.mk
  
  define Package/opendchub
@@ -37,14 +39,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(call Build/Compile/Default,\
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install \
-       )
-endef
-
-define Package/opendchub/install       
+define Package/opendchub/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opendchub $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opendchub $(1)/usr/bin/
  endef
diff --git a/net/openssh/Makefile b/net/openssh/Makefile

index 25ff989..2a4761b 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -122,8 +122,6 @@ endif
  CONFIGURE_VARS += LD="$(TARGET_CC)"
  
  define Build/Compile
  CONFIGURE_VARS += LD="$(TARGET_CC)"
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
                 LIBS="" \
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 DESTDIR="$(PKG_INSTALL_DIR)" \
                 LIBS="" \
@@ -145,7 +143,7 @@ endef
  
  define Package/openssh-client-utils/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/openssh-client-utils/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/
+       $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign keygen,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/
  endef
  
  define Package/openssh-server/install
  endef
  
  define Package/openssh-server/install
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile

index 803c536..0228935 100644 (file)
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
  PKG_MD5SUM:=452a83326ae198cf961e9ae02539c8fb
  
  PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
  PKG_MD5SUM:=452a83326ae198cf961e9ae02539c8fb
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/openvpn
  include $(INCLUDE_DIR)/package.mk
  
  define Package/openvpn
@@ -59,12 +61,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/openvpn/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/
  define Package/openvpn/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/
diff --git a/net/pepperspot/Makefile b/net/pepperspot/Makefile

index 6eac199..17fc5a0 100644 (file)
--- a/net/pepperspot/Makefile
+++ b/net/pepperspot/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/pepperspot
  PKG_MD5SUM:=a7ac2c8f93799f7d23d9ad2a0841fe4a
  
  PKG_SOURCE_URL:=@SF/pepperspot
  PKG_MD5SUM:=a7ac2c8f93799f7d23d9ad2a0841fe4a
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/pepperspot
  include $(INCLUDE_DIR)/package.mk
  
  define Package/pepperspot
@@ -39,12 +41,6 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/pepperspot/install
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/pepper
  define Package/pepperspot/install
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/pepper
diff --git a/net/qolyester/Makefile b/net/qolyester/Makefile

index 241e42a..13cbca4 100644 (file)
--- a/net/qolyester/Makefile
+++ b/net/qolyester/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://qolsr.lri.fr/code/
  PKG_MD5SUM:=650286fc2ea3e13c246d233aaa46f2a4
  
  PKG_SOURCE_URL:=http://qolsr.lri.fr/code/
  PKG_MD5SUM:=650286fc2ea3e13c246d233aaa46f2a4
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/qolyester
  include $(INCLUDE_DIR)/package.mk
  
  define Package/qolyester
@@ -32,13 +34,8 @@ define Package/qolyester/description
  endef
  
  # uses GNU configure
  endef
  
  # uses GNU configure
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
  
  
-define Package/qolyester/install       
+define Package/qolyester/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qolsrd $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qolsrd $(1)/usr/bin/
  endef
diff --git a/net/quagga-unstable/Makefile b/net/quagga-unstable/Makefile

index 2088495..c79a482 100644 (file)
--- a/net/quagga-unstable/Makefile
+++ b/net/quagga-unstable/Makefile
@@ -23,6 +23,8 @@ PKG_CONFIG_DEPENDS:= \
         CONFIG_PACKAGE_quagga-unstable-isisd \
         CONFIG_PACKAGE_quagga-unstable-ripngd
  
         CONFIG_PACKAGE_quagga-unstable-isisd \
         CONFIG_PACKAGE_quagga-unstable-ripngd
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/quagga-unstable/Default
  include $(INCLUDE_DIR)/package.mk
  
  define Package/quagga-unstable/Default
@@ -115,12 +117,6 @@ ifneq ($(CONFIG_PACKAGE_quagga-unstable-ripngd),)
    CONFIGURE_ARGS+= --enable-ripngd
  endif
  
    CONFIGURE_ARGS+= --enable-ripngd
  endif
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               all install
-endef
-
  define Package/quagga-unstable/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
  define Package/quagga-unstable/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
diff --git a/net/raddump/Makefile b/net/raddump/Makefile

index a576380..e5346d6 100644 (file)
--- a/net/raddump/Makefile
+++ b/net/raddump/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/raddump
  PKG_MD5SUM:=f8c29c67141ea78bb6ae8b97d5149480
  
  PKG_SOURCE_URL:=@SF/raddump
  PKG_MD5SUM:=f8c29c67141ea78bb6ae8b97d5149480
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/raddump
  include $(INCLUDE_DIR)/package.mk
  
  define Package/raddump
@@ -34,13 +36,7 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/raddump/install 
+define Package/raddump/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/
  endef
diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile

index 40383aa..df7a878 100644 (file)
--- a/net/radsecproxy/Makefile
+++ b/net/radsecproxy/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
  PKG_MD5SUM:=565b389268d906c3b465f63750938667
  
  PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
  PKG_MD5SUM:=565b389268d906c3b465f63750938667
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/radsecproxy
  include $(INCLUDE_DIR)/package.mk
  
  define Package/radsecproxy
@@ -32,12 +34,6 @@ endef
  CONFIGURE_ARGS+= \
         --with-ssl="$(STAGING_DIR)/usr"
  
  CONFIGURE_ARGS+= \
         --with-ssl="$(STAGING_DIR)/usr"
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/radsecproxy/install
         $(INSTALL_DIR) $(1)/usr/sbin/
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/
  define Package/radsecproxy/install
         $(INSTALL_DIR) $(1)/usr/sbin/
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/
diff --git a/net/rarpd/Makefile b/net/rarpd/Makefile

index 6d5a792..56c1391 100644 (file)
--- a/net/rarpd/Makefile
+++ b/net/rarpd/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=ftp://ftp.dementia.org/pub/net-tools
  PKG_MD5SUM:=04e2ca849e758d0b88c8281775ec3b58
  
  PKG_SOURCE_URL:=ftp://ftp.dementia.org/pub/net-tools
  PKG_MD5SUM:=04e2ca849e758d0b88c8281775ec3b58
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rarpd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rarpd
@@ -42,13 +44,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/rarpd/install   
+define Package/rarpd/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/etc/default
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/etc/default
diff --git a/net/reaim/Makefile b/net/reaim/Makefile

index 94d0ceb..1201801 100644 (file)
--- a/net/reaim/Makefile
+++ b/net/reaim/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/reaim
  PKG_MD5SUM:=647d2ab72ec454f89294accfb3182c09
  
  PKG_SOURCE_URL:=@SF/reaim
  PKG_MD5SUM:=647d2ab72ec454f89294accfb3182c09
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/reaim
  include $(INCLUDE_DIR)/package.mk
  
  define Package/reaim
@@ -30,15 +32,7 @@ define Package/reaim/description
  ReAIM is a proxy for file transfers with MSN/AIM.
  endef
  
  ReAIM is a proxy for file transfers with MSN/AIM.
  endef
  
-define Build/Compile   
-       $(call Build/Compile/Default, \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install \
-       )
-endef
-
-define Package/reaim/install   
+define Package/reaim/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/etc/init.d
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile

index 405831b..d120c34 100644 (file)
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/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.
  #
  # 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:=rp-l2tp
  PKG_VERSION:=0.4
  
  PKG_NAME:=rp-l2tp
  PKG_VERSION:=0.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/rp-l2tp
  PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
  
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/rp-l2tp
  PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rp-l2tpd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rp-l2tpd
@@ -30,11 +32,6 @@ define Package/rp-l2tpd/description
         Roaring Penguin L2TP (Layer 2 Tunneling Protocol) implementation.
  endef
  
         Roaring Penguin L2TP (Layer 2 Tunneling Protocol) implementation.
  endef
  
-# uses GNU configure
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
-
  TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/libevent $(TARGET_CFLAGS)
  
  define Package/rp-l2tpd/install        
  TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/libevent $(TARGET_CFLAGS)
  
  define Package/rp-l2tpd/install        
diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile

index 6397c8d..761f38b 100644 (file)
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://b2bua.org/chrome/site/
  PKG_MD5SUM:=b0b5d6cdce3f17cdbbac473c11a2d0e5
  
  PKG_SOURCE_URL:=http://b2bua.org/chrome/site/
  PKG_MD5SUM:=b0b5d6cdce3f17cdbbac473c11a2d0e5
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rtpproxy
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rtpproxy
@@ -27,12 +29,6 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/rtpproxy/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtpproxy $(1)/usr/bin/
  define Package/rtpproxy/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtpproxy $(1)/usr/bin/
diff --git a/net/scdp/Makefile b/net/scdp/Makefile

index 6ce6387..8c80131 100644 (file)
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/scdp
  PKG_MD5SUM:=7eafaf5a422e37d04715613993ed5d95
  
  PKG_SOURCE_URL:=@SF/scdp
  PKG_MD5SUM:=7eafaf5a422e37d04715613993ed5d95
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/scdp
  include $(INCLUDE_DIR)/package.mk
  
  define Package/scdp
@@ -30,7 +32,7 @@ define Package/scdp/description
         selected interfaces and tells the connected switch (cisco only)
         where the host is connected.
  endef
         selected interfaces and tells the connected switch (cisco only)
         where the host is connected.
  endef
-                       
+
  define Build/Configure
         $(call Build/Configure/Default, \
                 , \
  define Build/Configure
         $(call Build/Configure/Default, \
                 , \
@@ -40,12 +42,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/scdp/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/
  define Package/scdp/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/
diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile

index 7da9e91..8c8a447 100644 (file)
--- a/net/ser2net/Makefile
+++ b/net/ser2net/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/ser2net
  PKG_MD5SUM:=22977477789868923a5de09a85e847dd
  
  PKG_SOURCE_URL:=@SF/ser2net
  PKG_MD5SUM:=22977477789868923a5de09a85e847dd
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ser2net
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ser2net
@@ -37,12 +39,6 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/ser2net/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/
  define Package/ser2net/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/
diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile

index a8976fb..c0be483 100644 (file)
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -43,8 +43,6 @@ define Package/shorewall-lite/conffiles
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
         PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
  endef
  
         PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
  endef
  
diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile

index b6a5b70..02fff01 100644 (file)
--- a/net/sipsak/Makefile
+++ b/net/sipsak/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://download.berlios.de/sipsak/ \
         http://ftp.iptel.org/pub/sipsak/
  PKG_MD5SUM:=c4eb8e282902e75f4f040f09ea9d99d5
  
         http://ftp.iptel.org/pub/sipsak/
  PKG_MD5SUM:=c4eb8e282902e75f4f040f09ea9d99d5
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sipsak
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sipsak
@@ -25,17 +27,14 @@ define Package/sipsak
    TITLE:=SIP (Session Initiation Protocol) stress and diagnostics utility
    URL:=http://www.sipsak.org/
  endef
    TITLE:=SIP (Session Initiation Protocol) stress and diagnostics utility
    URL:=http://www.sipsak.org/
  endef
-                       
-CONFIGURE_ARGS += \
-       --disable-gnutls \
-
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-gnutls \
+       )
  endef
  
  endef
  
-define Package/sipsak/install  
+define Package/sipsak/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(1)/usr/bin/
  endef
diff --git a/net/slurm/Makefile b/net/slurm/Makefile

index 2f72362..53096f0 100644 (file)
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.wormulon.net/slurm/
  PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
  
  PKG_SOURCE_URL:=http://www.wormulon.net/slurm/
  PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/slurm
  include $(INCLUDE_DIR)/package.mk
  
  define Package/slurm
@@ -34,7 +36,7 @@ define Package/slurm/description
         - it's themeable.
  endef
  
         - it's themeable.
  endef
  
-define Build/Configure 
+define Build/Configure
         (cd $(PKG_BUILD_DIR); touch \
                 configure.in \
                 aclocal.m4 \
         (cd $(PKG_BUILD_DIR); touch \
                 configure.in \
                 aclocal.m4 \
@@ -49,13 +51,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/slurm/install   
+define Package/slurm/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/slurm $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/slurm $(1)/usr/bin/
  endef
diff --git a/net/socat/Makefile b/net/socat/Makefile

index 785bf4d..43a595b 100644 (file)
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
  PKG_MD5SUM:=6a0dd33cde2a18eb382433aca8f76ce2
  
  PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
  PKG_MD5SUM:=6a0dd33cde2a18eb382433aca8f76ce2
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/socat
  include $(INCLUDE_DIR)/package.mk
  
  define Package/socat
@@ -45,13 +47,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/socat/install   
+define Package/socat/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
  endef
diff --git a/net/ssltunnel/Makefile b/net/ssltunnel/Makefile

index 7c8249f..84ddadb 100644 (file)
--- a/net/ssltunnel/Makefile
+++ b/net/ssltunnel/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=${PKG_NAME}-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/ssltunnel/download
  PKG_MD5SUM:=4039b50566a33a4077883ea974e476d5
  
  PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/ssltunnel/download
  PKG_MD5SUM:=4039b50566a33a4077883ea974e476d5
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ssltunnel
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ssltunnel
@@ -43,12 +45,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/ssltunnel/install       
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pppclient $(1)/usr/bin/
  define Package/ssltunnel/install       
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pppclient $(1)/usr/bin/
diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile

index 4693305..c1f8aef 100644 (file)
--- a/net/stunnel/Makefile
+++ b/net/stunnel/Makefile
@@ -8,6 +8,8 @@ PKG_MD5SUM:=14dc3f8412947f0548975cbce74d6863
  PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  
  PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/stunnel
  include $(INCLUDE_DIR)/package.mk
  
  define Package/stunnel
@@ -41,9 +43,7 @@ endef
  define Build/Compile
         mkdir -p $(PKG_INSTALL_DIR)/etc/stunnel
         echo '#dummy' > $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.pem
  define Build/Compile
         mkdir -p $(PKG_INSTALL_DIR)/etc/stunnel
         echo '#dummy' > $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.pem
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       $(call Build/Compile/Default)
  endef
  
  define Package/stunnel/install
  endef
  
  define Package/stunnel/install
diff --git a/net/tinc/Makefile b/net/tinc/Makefile

index 6457c84..290a8a1 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -17,8 +17,12 @@ PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
         http://www.mirrors.wiretapped.net/security/network-security/tinc/
  PKG_MD5SUM:=ee0b1a3366c6e379cae34be6fa5dcb15
  
         http://www.mirrors.wiretapped.net/security/network-security/tinc/
  PKG_MD5SUM:=ee0b1a3366c6e379cae34be6fa5dcb15
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  include $(INCLUDE_DIR)/package.mk
  
+TARGET_CFLAGS+=-std=gnu99
+
  define Package/tinc
    SECTION:=net
    CATEGORY:=Network
  define Package/tinc
    SECTION:=net
    CATEGORY:=Network
@@ -41,12 +45,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/tinc/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
  define Package/tinc/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile

index 5a16f66..7d69c5a 100644 (file)
--- a/net/tinyproxy/Makefile
+++ b/net/tinyproxy/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
  PKG_MD5SUM:=09843d47828261394d0a30af0b058997
  
  PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
  PKG_MD5SUM:=09843d47828261394d0a30af0b058997
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tinyproxy
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tinyproxy
@@ -29,15 +31,12 @@ define Package/tinyproxy/conffiles
  /etc/config/tinyproxy
  endef
  
  /etc/config/tinyproxy
  endef
  
-CONFIGURE_ARGS+= \
-       --enable-filter \
-       --enable-transparent \
-       --enable-regexcheck=no \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-filter \
+               --enable-transparent \
+               --enable-regexcheck=no \
+       )
  endef
  
  define Package/tinyproxy/install
  endef
  
  define Package/tinyproxy/install
diff --git a/net/tmsnc/Makefile b/net/tmsnc/Makefile

index 012d427..b7b25fc 100644 (file)
--- a/net/tmsnc/Makefile
+++ b/net/tmsnc/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/tmsnc
  PKG_MD5SUM:=337dae91d4775e03b6681f61db56d2a7
  
  PKG_SOURCE_URL:=@SF/tmsnc
  PKG_MD5SUM:=337dae91d4775e03b6681f61db56d2a7
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tmsnc
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tmsnc
@@ -39,13 +41,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/tmsnc/install   
+define Package/tmsnc/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmsnc $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmsnc $(1)/usr/bin/
  endef
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile

index 05e9112..deee4db 100644 (file)
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -16,6 +16,8 @@ PKG_MD5SUM:=51caefd77e5d440d0bbd6443db4fc0f8
  PKG_SOURCE_URL:=@SF/tsocks
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)beta5.tar.gz
  
  PKG_SOURCE_URL:=@SF/tsocks
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)beta5.tar.gz
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tsocks
  include $(INCLUDE_DIR)/package.mk
  
  define Package/tsocks
@@ -35,13 +37,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(call Build/Compile/Default,\
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install \
-       )
-endef
-
  define Package/tsocks/install
         $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tsocks $(1)/usr/bin/
  define Package/tsocks/install
         $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tsocks $(1)/usr/bin/
diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile

index 3a86add..3bb0102 100644 (file)
--- a/net/umurmur/Makefile
+++ b/net/umurmur/Makefile
@@ -35,13 +35,7 @@ TARGET_CFLAGS := \
         -I$(STAGING_DIR)/usr/include \
         $(TARGET_CFLAGS)
  
         -I$(STAGING_DIR)/usr/include \
         $(TARGET_CFLAGS)
  
-define Build/Compile
-       CC="$(TARGET_CC)" \
-       CFLAGS="$(TARGET_CFLAGS)" \
-       LDFLAGS="$(TARGET_LDFLAGS)" \
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               all
-endef
+MAKE_PATH:=src
  
  define Package/umurmur/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/umurmur/install
         $(INSTALL_DIR) $(1)/usr/bin
diff --git a/net/updatedd/Makefile b/net/updatedd/Makefile

index 3cc0d40..7b75d24 100644 (file)
--- a/net/updatedd/Makefile
+++ b/net/updatedd/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
  PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
  PKG_MD5SUM:=f03446105ed043cd5dbd1ab95484d27f
  
  PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
  PKG_MD5SUM:=f03446105ed043cd5dbd1ab95484d27f
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/updatedd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/updatedd
@@ -102,10 +104,6 @@ define Package/updatedd-mod-zoneedit
    TITLE:=zoneedit.com
  endef
  
    TITLE:=zoneedit.com
  endef
  
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
-
  define Build/Configure
         (cd $(PKG_BUILD_DIR); aclocal && autoconf && automake )
         $(call Build/Configure/Default)
  define Build/Configure
         (cd $(PKG_BUILD_DIR); aclocal && autoconf && automake )
         $(call Build/Configure/Default)
diff --git a/net/uucp/Makefile b/net/uucp/Makefile

index 9a9b3e0..b2abf94 100644 (file)
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2008-2010 OpenWrt.org
  #
  # This is free software, licensed under the GNU General Public License v2.
  # See /LICENSE for more information.
  #
  # This is free software, licensed under the GNU General Public License v2.
  # See /LICENSE for more information.
@@ -9,11 +9,14 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=uucp
  PKG_VERSION:=1.07
  
  PKG_NAME:=uucp
  PKG_VERSION:=1.07
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
  PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/u/uucp/
  PKG_MD5SUM:=
  
  
  PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
  PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/u/uucp/
  PKG_MD5SUM:=
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/uucp
  include $(INCLUDE_DIR)/package.mk
  
  define Package/uucp
@@ -33,14 +36,6 @@ CONFIGURE_ARGS += \
         --enable-static \
         --enable-shared
  
         --enable-static \
         --enable-shared
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-
  define Package/uucp/install
         $(INSTALL_DIR) $(1)/usr/bin/
         $(CP) $(PKG_BUILD_DIR)/{cu,tstuu,uu{chk,cico,conv,cp,log,name,pick,sched,stat,to,x,xqt}} $(1)/usr/bin/
  define Package/uucp/install
         $(INSTALL_DIR) $(1)/usr/bin/
         $(CP) $(PKG_BUILD_DIR)/{cu,tstuu,uu{chk,cico,conv,cp,log,name,pick,sched,stat,to,x,xqt}} $(1)/usr/bin/
diff --git a/net/vgp/Makefile b/net/vgp/Makefile

index 86e42cc..46f3c85 100644 (file)
--- a/net/vgp/Makefile
+++ b/net/vgp/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://vgpd.freaknet.org/files/
  PKG_MD5SUM:=b8c25b5dfcb944f78bbc584be9c230c7
  
  PKG_SOURCE_URL:=http://vgpd.freaknet.org/files/
  PKG_MD5SUM:=b8c25b5dfcb944f78bbc584be9c230c7
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/vgp
  include $(INCLUDE_DIR)/package.mk
  
  define Package/vgp
@@ -34,12 +36,6 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/vgp/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/
  define Package/vgp/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/
diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile

index e2bb99f..d484e46 100644 (file)
--- a/net/wccpd/Makefile
+++ b/net/wccpd/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/wccpd
  PKG_MD5SUM:=5f15c274de61dfb88e0dbfc1ccbe6b67
  
  PKG_SOURCE_URL:=@SF/wccpd
  PKG_MD5SUM:=5f15c274de61dfb88e0dbfc1ccbe6b67
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/wccpd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/wccpd
@@ -31,16 +33,6 @@ define Package/wccpd/description
         protocol.
  endef
  
         protocol.
  endef
  
-define Build/Configure
-       $(call Build/Configure/Default)
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install 
-endef
-
  define Package/wccpd/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(1)/usr/sbin/
  define Package/wccpd/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(1)/usr/sbin/
diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile

index b313aba..db01719 100644 (file)
--- a/net/wifidog/Makefile
+++ b/net/wifidog/Makefile
@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:= @SF/$(PKG_NAME)
  PKG_MD5SUM:=e3ecacba67a91b6ea3c1072ba6c5a0b4
  
  PKG_SOURCE_URL:= @SF/$(PKG_NAME)
  PKG_MD5SUM:=e3ecacba67a91b6ea3c1072ba6c5a0b4
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -39,10 +40,6 @@ define Package/wifidog/conffiles
  /etc/wifidog.conf
  endef
  
  /etc/wifidog.conf
  endef
  
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
-       
  define Package/wifidog/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init
  define Package/wifidog/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init
diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile

index ec56621..975898d 100644 (file)
--- a/net/xsupplicant/Makefile
+++ b/net/xsupplicant/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/open1x
  PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226
  
  PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi
  PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226
  
  PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -55,13 +56,7 @@ define Build/Prepare
         );
  endef
  
         );
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/xsupplicant/install     
+define Package/xsupplicant/install
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/usr/bin
diff --git a/sound/flite/Makefile b/sound/flite/Makefile

index 6b64297..910bd8a 100644 (file)
--- a/sound/flite/Makefile
+++ b/sound/flite/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.
  #
  # 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:=flite
  PKG_VERSION:=1.3-release
  
  PKG_NAME:=flite
  PKG_VERSION:=1.3-release
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
  PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
  PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5
- 
+
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/flite
  include $(INCLUDE_DIR)/package.mk
  
  define Package/flite
@@ -41,14 +43,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/flite
         $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include/flite
         $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/
diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile

index da1bdec..c333805 100644 (file)
--- a/sound/madplay/Makefile
+++ b/sound/madplay/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.
  #
  # 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:=madplay
  PKG_VERSION:=0.15.2b
  
  PKG_NAME:=madplay
  PKG_VERSION:=0.15.2b
-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:=6814b47ceaa99880c754c5195aa1aac1
  
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/mad \
         ftp://ftp.mars.org/pub/mpeg/
  PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/madplay
  include $(INCLUDE_DIR)/package.mk
  
  define Package/madplay
@@ -49,13 +51,7 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/madplay/install 
+define Package/madplay/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
  endef
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile

index 84a4bb1..43eeb4c 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/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.
  #
  # 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:=mpd
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=mpd
-PKG_VERSION:=0.15.5
+PKG_VERSION:=0.15.8
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/musicpd
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=078bd45c8266ac577e4a96fa38d1e534
+PKG_MD5SUM:=
+
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -54,6 +56,8 @@ ifeq ($(CONFIG_PACKAGE_kmod-sound-core),)
         CONFIGURE_ARGS+= --disable-alsa
  endif
  
         CONFIGURE_ARGS+= --disable-alsa
  endif
  
+TARGET_CFLAGS+=-std=gnu99
+
  CONFIGURE_VARS += \
         CURL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto -lcurl" \
         CURL_CFLAGS="-I$(STAGING_DIR)/usr/include" \
  CONFIGURE_VARS += \
         CURL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto -lcurl" \
         CURL_CFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -68,12 +72,6 @@ CONFIGURE_VARS += \
         GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
         GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread"
  
         GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
         GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread"
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/mpd/install
         $(INSTALL_DIR) $(1)/etc
         $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf
  define Package/mpd/install
         $(INSTALL_DIR) $(1)/etc
         $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf
diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile

index e9e7478..e139833 100644 (file)
--- a/sound/mt-daapd/Makefile
+++ b/sound/mt-daapd/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=67bef9fb14d487693b0dfb792c3f1b05
  
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=67bef9fb14d487693b0dfb792c3f1b05
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/mt-daapd
  include $(INCLUDE_DIR)/package.mk
  
  define Package/mt-daapd
@@ -44,12 +46,6 @@ CONFIGURE_ARGS += \
         --with-howl-libs="$(STAGING_DIR)/usr/lib" \
         --without-static-libs \
  
         --with-howl-libs="$(STAGING_DIR)/usr/lib" \
         --without-static-libs \
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/mt-daapd/install
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/
  define Package/mt-daapd/install
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/
diff --git a/utils/bluez-hcidump/Makefile b/utils/bluez-hcidump/Makefile

index 9d75298..0385553 100644 (file)
--- a/utils/bluez-hcidump/Makefile
+++ b/utils/bluez-hcidump/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.
  #
  # 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-hcidump
  PKG_VERSION:=1.42
  
  PKG_NAME:=bluez-hcidump
  PKG_VERSION:=1.42
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
  PKG_MD5SUM:=5704737aaf72104eeaf77335218a1827
  
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
  PKG_MD5SUM:=5704737aaf72104eeaf77335218a1827
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/bluez-hcidump
  include $(INCLUDE_DIR)/package.mk
  
  define Package/bluez-hcidump
@@ -31,12 +33,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/bluez-hcidump/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/
  define Package/bluez-hcidump/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/
diff --git a/utils/ccid/Makefile b/utils/ccid/Makefile

index 52868f2..5d1f329 100644 (file)
--- a/utils/ccid/Makefile
+++ b/utils/ccid/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3080
  PKG_MD5SUM:=727dc7eb4d560f81fe70a766a96de970
  
  PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3080
  PKG_MD5SUM:=727dc7eb4d560f81fe70a766a96de970
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ccid
  include $(INCLUDE_DIR)/package.mk
  
  define Package/ccid
@@ -37,12 +39,6 @@ define Build/Configure
         )
  endef
  
         )
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/ccid/install
         $(INSTALL_DIR) $(1)/usr/lib/pcsc/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pcsc/drivers $(1)/usr/lib/pcsc/
  define Package/ccid/install
         $(INSTALL_DIR) $(1)/usr/lib/pcsc/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pcsc/drivers $(1)/usr/lib/pcsc/
diff --git a/utils/cifsmount/Makefile b/utils/cifsmount/Makefile

index a3d2466..a8cb2da 100644 (file)
--- a/utils/cifsmount/Makefile
+++ b/utils/cifsmount/Makefile
@@ -27,7 +27,6 @@ define Package/cifsmount/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/utils/event_test/Makefile b/utils/event_test/Makefile

index 7a13419..c10fe4b 100644 (file)
--- a/utils/event_test/Makefile
+++ b/utils/event_test/Makefile
@@ -26,7 +26,6 @@ define Package/event_test/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
diff --git a/utils/gnokii/Makefile b/utils/gnokii/Makefile

index e74256f..eff5f1f 100644 (file)
--- a/utils/gnokii/Makefile
+++ b/utils/gnokii/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.
  #
  # 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:=gnokii
  PKG_VERSION:=0.6.21
  
  PKG_NAME:=gnokii
  PKG_VERSION:=0.6.21
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x
  PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8
  
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x
  PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/gnokii
  include $(INCLUDE_DIR)/package.mk
  
  define Package/gnokii
@@ -45,13 +47,7 @@ define Build/Configure
                 )
  endef
  
                 )
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/gnokii/install  
+define Package/gnokii/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_DIR) $(1)/usr/lib
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_DIR) $(1)/usr/lib
diff --git a/utils/gzip/Makefile b/utils/gzip/Makefile

index cf9cf88..a788a6e 100644 (file)
--- a/utils/gzip/Makefile
+++ b/utils/gzip/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.
  #
  # 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:=gzip
  PKG_VERSION:=1.3.13
  
  PKG_NAME:=gzip
  PKG_VERSION:=1.3.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@GNU/gzip/
  PKG_MD5SUM:=c54a31b93e865f6a4410b2dc64662706
  
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@GNU/gzip/
  PKG_MD5SUM:=c54a31b93e865f6a4410b2dc64662706
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/gzip
  include $(INCLUDE_DIR)/package.mk
  
  define Package/gzip
@@ -33,14 +35,8 @@ endef
  CONFIGURE_VARS += \
         gl_cv_func_getopt_gnu=yes \
  
  CONFIGURE_VARS += \
         gl_cv_func_getopt_gnu=yes \
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-       $(SED) 's,/bin/bash,/bin/sh,g' $(PKG_INSTALL_DIR)/usr/bin/{gunzip,zcat}
-endef
-
  define Package/gzip/install
  define Package/gzip/install
+       $(SED) 's,/bin/bash,/bin/sh,g' $(PKG_INSTALL_DIR)/usr/bin/{gunzip,zcat}
         $(INSTALL_DIR) $(1)/usr/bin
         $(CP) $(PKG_INSTALL_DIR)/usr/bin/{gunzip,gzip,zcat} $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(CP) $(PKG_INSTALL_DIR)/usr/bin/{gunzip,gzip,zcat} $(1)/usr/bin/
  endef
diff --git a/utils/input-utils/Makefile b/utils/input-utils/Makefile

index dbcc4fa..015ddde 100644 (file)
--- a/utils/input-utils/Makefile
+++ b/utils/input-utils/Makefile
@@ -27,8 +27,6 @@ define Build/Configure
  endef
  
  define Build/Compile
  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)" \
         $(MAKE) -C "$(PKG_BUILD_DIR)" \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/utils/io/Makefile b/utils/io/Makefile

index a959438..ddf9440 100644 (file)
--- a/utils/io/Makefile
+++ b/utils/io/Makefile
@@ -27,7 +27,7 @@ define Package/io/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
+       $(INSTALL_DIR) $(PKG_BUILD_DIR)
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile

index 457076b..4663f61 100644 (file)
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@@ -18,7 +18,8 @@ PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
  PKG_SOURCE_VERSION:=$(PKG_REV)
  PKG_SOURCE_PROTO:=svn
  
  PKG_SOURCE_VERSION:=$(PKG_REV)
  PKG_SOURCE_PROTO:=svn
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -222,10 +223,6 @@ CONFIGURE_ARGS += \
         --with-plugins="$(strip $(LCD4LINUX_CONFIGURE_PLUGINS))" \
  
  
         --with-plugins="$(strip $(LCD4LINUX_CONFIGURE_PLUGINS))" \
  
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
  define Package/lcd4linux/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
  define Package/lcd4linux/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile

index 7c554b2..6e93bad 100644 (file)
--- a/utils/lrzsz/Makefile
+++ b/utils/lrzsz/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/
  PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4
  
  PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/
  PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/lrzsz
  include $(INCLUDE_DIR)/package.mk
  
  define Package/lrzsz
@@ -33,13 +35,7 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/lrzsz/install   
+define Package/lrzsz/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/
diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile

index 112fce0..acd3bc9 100644 (file)
--- a/utils/macchanger/Makefile
+++ b/utils/macchanger/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@GNU/macchanger
  PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7
  
  PKG_SOURCE_URL:=@GNU/macchanger
  PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/macchanger
  include $(INCLUDE_DIR)/package.mk
  
  define Package/macchanger
@@ -29,13 +31,7 @@ define Package/macchanger/description
         of network interfaces.
  endef
  
         of network interfaces.
  endef
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/macchanger/install      
+define Package/macchanger/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/share
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/share
diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile

index 95576d9..09b2c9b 100644 (file)
--- a/utils/owfs/Makefile
+++ b/utils/owfs/Makefile
@@ -13,7 +13,9 @@ PKG_RELEASE:=1
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=8aea6f3bb0dc9fdb52ed3f0e9d84fa79
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)
  PKG_MD5SUM:=8aea6f3bb0dc9fdb52ed3f0e9d84fa79
-PKG_FIXUP = libtool
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -194,25 +196,19 @@ define Build/Configure
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
                 CPPFLAGS="$(TARGET_CPPFLAGS)" \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
                 CPPFLAGS="$(TARGET_CPPFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               lt_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-               lt_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(TOOLCHAIN_DIR)/usr/lib" \
+               lt_cv_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+               lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
                 shrext_cmds=".so" \
                 ./configure \
                         $(CONFIGURE_ARGS) \
         );
  endef
  
                 shrext_cmds=".so" \
                 ./configure \
                         $(CONFIGURE_ARGS) \
         );
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Build/InstallDev
  define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/include
         $(CP)   $(PKG_INSTALL_DIR)/usr/include/{owcapi,owfs_config}.h $(STAGING_DIR)/usr/include/
         $(CP)   $(PKG_INSTALL_DIR)/usr/include/{owcapi,owfs_config}.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
         $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libow-*.so* $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so* $(STAGING_DIR)/usr/lib/
  endef
  
         $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libow-*.so* $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so* $(STAGING_DIR)/usr/lib/
  endef
  
diff --git a/utils/pcmciautils/Makefile b/utils/pcmciautils/Makefile

index 3e04b8c..87dd324 100644 (file)
--- a/utils/pcmciautils/Makefile
+++ b/utils/pcmciautils/Makefile
@@ -26,8 +26,6 @@ define Package/pcmciautils
  endef
  
  define Build/Compile
  endef
  
  define Build/Compile
-       rm -rf "$(PKG_INSTALL_DIR)"
-       mkdir -p "$(PKG_INSTALL_DIR)"
         $(call Build/Compile/Default, \
                 LD="$(TARGET_CC)" UDEV=false \
                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
         $(call Build/Compile/Default, \
                 LD="$(TARGET_CC)" UDEV=false \
                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
diff --git a/utils/pipacs/Makefile b/utils/pipacs/Makefile

index a445757..5d1b08f 100644 (file)
--- a/utils/pipacs/Makefile
+++ b/utils/pipacs/Makefile
@@ -20,19 +20,18 @@ define Package/pipacs
    TITLE:=UNIX socket accounting/wiewer program
  endef
  
    TITLE:=UNIX socket accounting/wiewer program
  endef
  
-define Build/Prepare   
-       mkdir -p $(PKG_BUILD_DIR)
+define Build/Prepare
         $(CP) ./src/* $(PKG_BUILD_DIR)
  endef
  
         $(CP) ./src/* $(PKG_BUILD_DIR)
  endef
  
-define Build/Compile   
+define Build/Compile
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                 all
  endef
  
         $(MAKE) -C $(PKG_BUILD_DIR) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                 all
  endef
  
-define Package/pipacs/install  
+define Package/pipacs/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/
  endef
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/
  endef
diff --git a/utils/reiserfsprogs/Makefile b/utils/reiserfsprogs/Makefile

index 9313d96..3c583e9 100644 (file)
--- a/utils/reiserfsprogs/Makefile
+++ b/utils/reiserfsprogs/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/reiserfs/
  PKG_MD5SUM:=bc00c7c4e047902575dc4e1c64ab3ba4
  
  PKG_FIXUP:=libtool
  PKG_MD5SUM:=bc00c7c4e047902575dc4e1c64ab3ba4
  
  PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -32,12 +33,6 @@ define Package/reiserfsprogs/description
         resize, and debug ReiserFS filesystems.
  endef
  
         resize, and debug ReiserFS filesystems.
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/reiserfsprogs/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(foreach bin,debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs,$(PKG_INSTALL_DIR)/usr/sbin/$(bin)) $(1)/usr/sbin/
  define Package/reiserfsprogs/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(foreach bin,debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs,$(PKG_INSTALL_DIR)/usr/sbin/$(bin)) $(1)/usr/sbin/
diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile

index fbe0035..b1867b7 100644 (file)
--- a/utils/rrdcollect/Makefile
+++ b/utils/rrdcollect/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/rrdcollect
  PKG_MD5SUM:=fd7ac95195e3e5cbab0677629505d9be
  
  PKG_SOURCE_URL:=@SF/rrdcollect
  PKG_MD5SUM:=fd7ac95195e3e5cbab0677629505d9be
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rrdcollect/Default
  include $(INCLUDE_DIR)/package.mk
  
  define Package/rrdcollect/Default
@@ -72,18 +74,12 @@ CONFIGURE_ARGS+= \
  CONFIGURE_VARS+= \
         CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
  
  CONFIGURE_VARS+= \
         CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
  
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/rrdcollect/install      
+define Package/rrdcollect/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/
  endef
  
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/
  endef
  
-define Package/rrdcollect-example/install      
+define Package/rrdcollect-example/install
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) ./files/rrd.conf $(1)/etc/
         $(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_DATA) ./files/rrd.conf $(1)/etc/
         $(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/
diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile

index caab4d6..dac6653 100644 (file)
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -21,7 +21,8 @@ PKG_CONFIG_DEPENDS:= \
         CONFIG_PACKAGE_python-rrd \
         CONFIG_PACKAGE_rrdcgi \
  
         CONFIG_PACKAGE_python-rrd \
         CONFIG_PACKAGE_rrdcgi \
  
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
  
  include $(INCLUDE_DIR)/package.mk
  -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
  
  include $(INCLUDE_DIR)/package.mk
  -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
@@ -96,7 +97,7 @@ endif
  
  define Build/Compile
         $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
  
  define Build/Compile
         $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+       $(call Build/Compile/Default)
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile

index 4962ba6..01aa4d5 100644 (file)
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
  PKG_MD5SUM:=a0cfdfdebca2feb4f2ba5d3418b15a42
  
  PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
  PKG_MD5SUM:=a0cfdfdebca2feb4f2ba5d3418b15a42
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sane-backends/Default
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sane-backends/Default
@@ -81,12 +83,6 @@ define Build/Configure
         $(Build/Configure/Default)
  endef
  
         $(Build/Configure/Default)
  endef
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/sane-backends/conffiles
  /etc/sane.d/saned.conf
  endef
  define Package/sane-backends/conffiles
  /etc/sane.d/saned.conf
  endef
diff --git a/utils/sysfsutils/Makefile b/utils/sysfsutils/Makefile

index f9a52fe..5623152 100644 (file)
--- a/utils/sysfsutils/Makefile
+++ b/utils/sysfsutils/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/linux-diag
  PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc
  
  PKG_SOURCE_URL:=@SF/linux-diag
  PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sysfsutils
  include $(INCLUDE_DIR)/package.mk
  
  define Package/sysfsutils
@@ -26,18 +28,6 @@ define Package/sysfsutils
    URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
  endef
  
    URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
  endef
  
-define Build/Configure
-       $(call Build/Configure/Default)
-endef
-
-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
         $(CP) $(PKG_INSTALL_DIR)/usr/include/sysfs $(1)/usr/include/
  define Build/InstallDev
         $(INSTALL_DIR) $(1)/usr/include
         $(CP) $(PKG_INSTALL_DIR)/usr/include/sysfs $(1)/usr/include/
diff --git a/utils/testusb/Makefile b/utils/testusb/Makefile

index ea7563b..0e0b045 100644 (file)
--- a/utils/testusb/Makefile
+++ b/utils/testusb/Makefile
@@ -28,7 +28,6 @@ define Package/testusb/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
         $(CP) ./src/* $(PKG_BUILD_DIR)/
  endef
  
diff --git a/utils/ucmb-tools/Makefile b/utils/ucmb-tools/Makefile

index 527b7d3..ccbaef8 100644 (file)
--- a/utils/ucmb-tools/Makefile
+++ b/utils/ucmb-tools/Makefile
@@ -24,7 +24,6 @@ define Package/ucmb-tools/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
         $(CP) ./tools/* $(PKG_BUILD_DIR)/
  endef
  
         $(CP) ./tools/* $(PKG_BUILD_DIR)/
  endef
  
diff --git a/utils/ucmb/Makefile b/utils/ucmb/Makefile

index f3d3915..0dfe36b 100644 (file)
--- a/utils/ucmb/Makefile
+++ b/utils/ucmb/Makefile
@@ -42,7 +42,6 @@ define KernelPackage/ucmb/description
  endef
  
  define Build/Prepare
  endef
  
  define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
         $(CP) ./driver/* $(PKG_BUILD_DIR)/
  endef
  
         $(CP) ./driver/* $(PKG_BUILD_DIR)/
  endef
  
diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile

index 814d8f2..f15e63c 100644 (file)
--- a/utils/usbutils/Makefile
+++ b/utils/usbutils/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/linux-usb
  PKG_MD5SUM:=34979f675d2bcb3e1b45012fa830a53f
  
  PKG_SOURCE_URL:=@SF/linux-usb
  PKG_MD5SUM:=34979f675d2bcb3e1b45012fa830a53f
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/usbutils
  include $(INCLUDE_DIR)/package.mk
  
  define Package/usbutils
@@ -33,12 +35,6 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
  define Package/usbutils/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/usb-devices $(1)/usr/bin/
  define Package/usbutils/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/usb-devices $(1)/usr/bin/
diff --git a/utils/wx200d/Makefile b/utils/wx200d/Makefile

index aca985d..c33d071 100644 (file)
--- a/utils/wx200d/Makefile
+++ b/utils/wx200d/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/wx200d
  PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c
  
  PKG_SOURCE_URL:=@SF/wx200d
  PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c
  
+PKG_INSTALL:=1
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/wx200d
  include $(INCLUDE_DIR)/package.mk
  
  define Package/wx200d
@@ -33,13 +35,7 @@ endef
  
  # uses GNU configure
  
  
  # uses GNU configure
  
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/wx200d/install  
+define Package/wx200d/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(CP)   $(PKG_INSTALL_DIR)/usr/bin/wx200 \
                 $(PKG_INSTALL_DIR)/usr/bin/wxstdout \
         $(INSTALL_DIR) $(1)/usr/bin
         $(CP)   $(PKG_INSTALL_DIR)/usr/bin/wx200 \
                 $(PKG_INSTALL_DIR)/usr/bin/wxstdout \
author	lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
	Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)
committer	lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
	Thu, 18 Feb 2010 13:10:21 +0000 (13:10 +0000)
Xorg/lib/atk/Makefile		patch \| blob \| history
Xorg/lib/tslib/Makefile		patch \| blob \| history
Xorg/wm/matchbox-window-manager/Makefile		patch \| blob \| history
admin/zabbix/Makefile		patch \| blob \| history
lang/egenix-mx/Makefile		patch \| blob \| history
lang/perl/Makefile		patch \| blob \| history
lang/pygtk/Makefile		patch \| blob \| history
lang/pygtk/patches/010-dont-override-python-include-dir.patch	[deleted file]	patch \| blob \| history
libs/aalib/Makefile		patch \| blob \| history
libs/apr/Makefile		patch \| blob \| history
libs/argtable/Makefile		patch \| blob \| history
libs/avahi/Makefile		patch \| blob \| history
libs/bluez-libs/Makefile		patch \| blob \| history
libs/classpath/Makefile		patch \| blob \| history
libs/clinkc/Makefile		patch \| blob \| history
libs/db47/Makefile		patch \| blob \| history
libs/eventlog/Makefile		patch \| blob \| history
libs/faad2/Makefile		patch \| blob \| history
libs/fcgi/Makefile		patch \| blob \| history
libs/file/Makefile		patch \| blob \| history
libs/gd/Makefile		patch \| blob \| history
libs/glib/Makefile		patch \| blob \| history
libs/gsl/Makefile		patch \| blob \| history
libs/gsm/Makefile		patch \| blob \| history
libs/howl/Makefile		patch \| blob \| history
libs/id3lib/Makefile		patch \| blob \| history
libs/iksemel/Makefile		patch \| blob \| history
libs/jpeg/Makefile		patch \| blob \| history
libs/libaio/Makefile		patch \| blob \| history
libs/libao/Makefile		patch \| blob \| history
libs/libatomicops/Makefile		patch \| blob \| history
libs/libcelt/Makefile		patch \| blob \| history
libs/libcrypto++/Makefile		patch \| blob \| history
libs/libdaemon/Makefile		patch \| blob \| history
libs/libdbi/Makefile		patch \| blob \| history
libs/libdmapsharing/Makefile		patch \| blob \| history
libs/libdnet/Makefile		patch \| blob \| history
libs/libffi-sable/Makefile		patch \| blob \| history
libs/libgcrypt/Makefile		patch \| blob \| history
libs/libid3tag/Makefile		patch \| blob \| history
libs/libjson-c/Makefile		patch \| blob \| history
libs/libmad/Makefile		patch \| blob \| history
libs/libmcrypt/Makefile		patch \| blob \| history
libs/libmms/Makefile		patch \| blob \| history
libs/libmpd/Makefile		patch \| blob \| history
libs/libnet-1.0.x/Makefile		patch \| blob \| history
libs/libnet-1.1.x/Makefile		patch \| blob \| history
libs/libnfnetlink/Makefile		patch \| blob \| history
libs/libosip2/Makefile		patch \| blob \| history
libs/libpar2/Makefile		patch \| blob \| history
libs/libpng/Makefile		patch \| blob \| history
libs/librsync/Makefile		patch \| blob \| history
libs/libsamplerate/Makefile		patch \| blob \| history
libs/libshout/Makefile		patch \| blob \| history
libs/libsndfile/Makefile		patch \| blob \| history
libs/libsynce/Makefile		patch \| blob \| history
libs/libtasn1/Makefile		patch \| blob \| history
libs/libtorrent/Makefile		patch \| blob \| history
libs/libtwin/Makefile		patch \| blob \| history
libs/libvorbisidec/Makefile		patch \| blob \| history
libs/libyaml/Makefile		patch \| blob \| history
libs/mysql/Makefile		patch \| blob \| history
libs/popt/Makefile		patch \| blob \| history
libs/rrdtool-1.0.x/Makefile		patch \| blob \| history
libs/sqlite2/Makefile		patch \| blob \| history
libs/sqlite3/Makefile		patch \| blob \| history
libs/ustl/Makefile		patch \| blob \| history
libs/wxbase/Makefile		patch \| blob \| history
multimedia/gst-plugins-good/Makefile		patch \| blob \| history
multimedia/hasciicam/Makefile		patch \| blob \| history
multimedia/motion/Makefile		patch \| blob \| history
multimedia/peercast/Makefile		patch \| blob \| history
net/aircrack-ng/Makefile		patch \| blob \| history
net/aircrack-ptw/Makefile		patch \| blob \| history
net/amwall/Makefile		patch \| blob \| history
net/apache/Makefile		patch \| blob \| history
net/appweb/Makefile		patch \| blob \| history
net/arpd/Makefile		patch \| blob \| history
net/bind/Makefile		patch \| blob \| history
net/bitchx/Makefile		patch \| blob \| history
net/chillispot/Makefile		patch \| blob \| history
net/click/Makefile		patch \| blob \| history
net/cups/Makefile		patch \| blob \| history
net/dansguardian/Makefile		patch \| blob \| history
net/darkstat/Makefile		patch \| blob \| history
net/dhcpcd/Makefile		patch \| blob \| history
net/dircproxy/Makefile		patch \| blob \| history
net/ekg/Makefile		patch \| blob \| history
net/faifa/Makefile		patch \| blob \| history
net/gpsd/Makefile		patch \| blob \| history
net/ipcad/Makefile		patch \| blob \| history
net/ipkungfu/Makefile		patch \| blob \| history
net/ipsec-tools/Makefile		patch \| blob \| history
net/keepalived/Makefile		patch \| blob \| history
net/krb5/Makefile		patch \| blob \| history
net/matrixtunnel/Makefile		patch \| blob \| history
net/miau/Makefile		patch \| blob \| history
net/mtr/Makefile		patch \| blob \| history
net/mutella/Makefile		patch \| blob \| history
net/nagios-plugins/Makefile		patch \| blob \| history
net/natpmp/Makefile		patch \| blob \| history
net/netcat/Makefile		patch \| blob \| history
net/netdiscover/Makefile		patch \| blob \| history
net/ngircd/Makefile		patch \| blob \| history
net/nmap/Makefile		patch \| blob \| history
net/nocatsplash/Makefile		patch \| blob \| history
net/olsrd/Makefile		patch \| blob \| history
net/opendchub/Makefile		patch \| blob \| history
net/openssh/Makefile		patch \| blob \| history
net/openvpn/Makefile		patch \| blob \| history
net/pepperspot/Makefile		patch \| blob \| history
net/qolyester/Makefile		patch \| blob \| history
net/quagga-unstable/Makefile		patch \| blob \| history
net/raddump/Makefile		patch \| blob \| history
net/radsecproxy/Makefile		patch \| blob \| history
net/rarpd/Makefile		patch \| blob \| history
net/reaim/Makefile		patch \| blob \| history
net/rp-l2tp/Makefile		patch \| blob \| history
net/rtpproxy/Makefile		patch \| blob \| history
net/scdp/Makefile		patch \| blob \| history
net/ser2net/Makefile		patch \| blob \| history
net/shorewall-lite/Makefile		patch \| blob \| history
net/sipsak/Makefile		patch \| blob \| history
net/slurm/Makefile		patch \| blob \| history
net/socat/Makefile		patch \| blob \| history
net/ssltunnel/Makefile		patch \| blob \| history
net/stunnel/Makefile		patch \| blob \| history
net/tinc/Makefile		patch \| blob \| history
net/tinyproxy/Makefile		patch \| blob \| history
net/tmsnc/Makefile		patch \| blob \| history
net/tsocks/Makefile		patch \| blob \| history
net/umurmur/Makefile		patch \| blob \| history
net/updatedd/Makefile		patch \| blob \| history
net/uucp/Makefile		patch \| blob \| history
net/vgp/Makefile		patch \| blob \| history
net/wccpd/Makefile		patch \| blob \| history
net/wifidog/Makefile		patch \| blob \| history
net/xsupplicant/Makefile		patch \| blob \| history
sound/flite/Makefile		patch \| blob \| history
sound/madplay/Makefile		patch \| blob \| history
sound/mpd/Makefile		patch \| blob \| history
sound/mt-daapd/Makefile		patch \| blob \| history
utils/bluez-hcidump/Makefile		patch \| blob \| history
utils/ccid/Makefile		patch \| blob \| history
utils/cifsmount/Makefile		patch \| blob \| history
utils/event_test/Makefile		patch \| blob \| history
utils/gnokii/Makefile		patch \| blob \| history
utils/gzip/Makefile		patch \| blob \| history
utils/input-utils/Makefile		patch \| blob \| history
utils/io/Makefile		patch \| blob \| history
utils/lcd4linux/Makefile		patch \| blob \| history
utils/lrzsz/Makefile		patch \| blob \| history
utils/macchanger/Makefile		patch \| blob \| history
utils/owfs/Makefile		patch \| blob \| history
utils/pcmciautils/Makefile		patch \| blob \| history
utils/pipacs/Makefile		patch \| blob \| history
utils/reiserfsprogs/Makefile		patch \| blob \| history
utils/rrdcollect/Makefile		patch \| blob \| history
utils/rrdtool/Makefile		patch \| blob \| history
utils/sane-backends/Makefile		patch \| blob \| history
utils/sysfsutils/Makefile		patch \| blob \| history
utils/testusb/Makefile		patch \| blob \| history
utils/ucmb-tools/Makefile		patch \| blob \| history
utils/ucmb/Makefile		patch \| blob \| history
utils/usbutils/Makefile		patch \| blob \| history
utils/wx200d/Makefile		patch \| blob \| history