From 93bdd996176c3237696e554d6d1b567ba29aca23 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 9 May 2005 09:33:23 +0000
Subject: merge nico's package/rules.mk and package/templates.mk into one file,
 update packages that use this

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@817 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/shfs/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'package/shfs/Makefile')

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 470e97272..b7b90762e 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -7,9 +7,7 @@ PKG_VERSION := 0.35
 PKG_RELEASE := 2
 PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe
 
-PKG_SOURCE_URL := \
-	@SF/shfs \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL := @SF/shfs
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
 PKG_SOURCE_DIR := 
@@ -17,13 +15,11 @@ PKG_SOURCE_DIR :=
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/templates.mk
+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)))
 
-include $(TOPDIR)/package/rules.mk
-
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 	  OFLAGS="$(TARGET_CFLAGS)" \
-- 
cgit v1.2.3