aboutsummaryrefslogtreecommitdiffstats
path: root/package/shfs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-05-12 18:18:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-05-12 18:18:21 +0000
commit9a3ef1ddc5041cacead661bc161588eacdc34b1a (patch)
tree94edd7fc2d4428a4d59bc6b22bf45f07ea9c1104 /package/shfs
parent49f96a710b156a2e0118e0eeea7a9b39ca7ce57f (diff)
downloadmaster-187ad058-9a3ef1ddc5041cacead661bc161588eacdc34b1a.tar.gz
master-187ad058-9a3ef1ddc5041cacead661bc161588eacdc34b1a.tar.bz2
master-187ad058-9a3ef1ddc5041cacead661bc161588eacdc34b1a.zip
clean up shfs package
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@837 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/shfs')
-rw-r--r--package/shfs/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index b7b90762ed..0a9fcda75f 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -20,7 +20,7 @@ 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)/.built: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
OFLAGS="$(TARGET_CFLAGS)" \
CC="$(TARGET_CC)" \
@@ -28,30 +28,25 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
KERNEL="$(LINUX_VERSION)" \
KERNEL_SOURCES="$(LINUX_DIR)" \
all
- touch $(PKG_BUILD_DIR)/.built
-
-$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
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)/.installed
+ touch $(PKG_BUILD_DIR)/.built
-$(IPKG_KMOD_SHFS): $(IDIR_KMOD_SHFS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_KMOD_SHFS):
install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.o \
$(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
$(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
- mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)
-$(IPKG_SHFS_UTILS): $(IDIR_SHFS_UTILS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_SHFS_UTILS):
install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/
$(RSTRIP) $(IDIR_SHFS_UTILS)
- mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR)