Add fix from whiterussian

[openwrt.git] / openwrt / package / cifsmount / Makefile

diff --git a/openwrt/package/cifsmount/Makefile b/openwrt/package/cifsmount/Makefile
index 0fa6a1f..2cb64d4 100644 (file)
--- a/openwrt/package/cifsmount/Makefile
+++ b/openwrt/package/cifsmount/Makefile
@@ -7,22 +7,24 @@ PKG_VERSION:=1.5
 PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/cifsmount
 PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/cifsmount

-PKG_IPK_DIR:=$(PKG_BUILD_DIR)
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-$(PKG_BUILD_DIR)/sbin/mount.cifs:
-       mkdir -p $(PKG_BUILD_DIR)/sbin
-       $(TARGET_CC) -o $@ mount.cifs.c
-       $(STRIP) $@
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/sbin/mount.cifs
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-source:
-prepare:
-compile: $(PKG_IPK)
-install:
-       $(IPKG) install $(PKG_IPK)
-clean:
-       rm -rf $(PKG_BUILD_DIR)
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,CIFSMOUNT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.prepared:
+       mkdir -p $@
+       touch $@
+
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+
+$(PKG_BUILD_DIR)/.built:
+       $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mount.cifs mount.cifs.c
+       touch $@
+
+$(IPKG_CIFSMOUNT):
+       install -d -m0755 $(IDIR_CIFSMOUNT)/sbin
+       install -m0755 $(PKG_BUILD_DIR)/mount.cifs $(IDIR_CIFSMOUNT)/sbin/
+       $(RSTRIP) $(IDIR_CIFSMOUNT)
+       $(IPKG_BUILD) $(IDIR_CIFSMOUNT) $(PACKAGE_DIR)