X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fhotplug2%2FMakefile;h=7e1dda7a04aa898f55b891f5c5a85b53bf6b2ec7;hb=39ca02e48743c10468e6d22f6d46f20abfc3d5dd;hp=3dab96ba7f14d3c46e4dae4178cea5bc233fc1bc;hpb=673d770d1942bc3f936ecd51750d6d033f2d0f04;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index 3dab96ba7f..7e1dda7a04 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hotplug2
-PKG_REV:=199
+PKG_REV:=201
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=hotplug2-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://svn.nomi.cz/svn/isteve/hotplug2 
+PKG_SOURCE_URL:=http://svn.nomi.cz/svn/isteve/hotplug2
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 #PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
 #PKG_MD5SUM:=ea2c01d027b4002e4e6b0ff266f51a51
@@ -36,15 +36,25 @@ define Package/hotplug2/description
  This is an implementation of Hotplug2-1.0-beta
 endef
 
-MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS) $(FPIC) -DHAVE_RULES -I."
+define Package/hotplug2/conffiles
+/etc/hotplug2.rules
+endef
+
+MAKE_FLAGS += \
+	COPTS="$(TARGET_CFLAGS)" \
+	STATIC_WORKER="fork"
+
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/udevtrigger src/udevtrigger.c
+endef
 
 define Package/hotplug2/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) ./files/hotplug2.rules $(1)/etc/
 	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udevtrigger $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hotplug2 $(1)/sbin/
-	$(INSTALL_DIR) $(1)/lib/hotplug2
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/workers/worker_fork.so $(1)/lib/hotplug2
 endef
 
 $(eval $(call BuildPackage,hotplug2))