Convert openssl to new packaging style, install devel stuff in STAGING_DIR/usr, chang...

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

diff --git a/openwrt/package/shfs/Makefile b/openwrt/package/shfs/Makefile
index 0a9fcda..d696830 100644 (file)
--- a/openwrt/package/shfs/Makefile
+++ b/openwrt/package/shfs/Makefile
@@ -10,7 +10,6 @@ PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe
 PKG_SOURCE_URL := @SF/shfs
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
-PKG_SOURCE_DIR := 
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -20,21 +19,20 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+
 $(PKG_BUILD_DIR)/.built: 
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-         OFLAGS="$(TARGET_CFLAGS)" \
-         CC="$(TARGET_CC)" \
-         LINKER="$(TARGET_CC)" \
-         KERNEL="$(LINUX_VERSION)" \
-         KERNEL_SOURCES="$(LINUX_DIR)" \
-        all
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-         ROOT="$(PKG_INSTALL_DIR)" \
-         KERNEL="$(LINUX_VERSION)" \
-         KERNEL_SOURCES="$(LINUX_DIR)" \
-        install
-       touch $(PKG_BUILD_DIR)/.built
+               OFLAGS="$(TARGET_CFLAGS)" \
+               CC="$(TARGET_CC)" \
+               LINKER="$(TARGET_CC)" \
+               KERNEL="$(LINUX_VERSION)" \
+               KERNEL_SOURCES="$(LINUX_DIR)" \
+               all install
+       touch $@
 
 $(IPKG_KMOD_SHFS):
        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)