From 393ad22147939bc66a67549a41f9c8089047d93b Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 18 Apr 2005 06:34:57 +0000 Subject: Uniformize package Makefile, move ipkg related files to ./ipkg git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@665 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/haserl/Makefile | 4 ++-- package/haserl/haserl.control | 8 -------- package/haserl/ipkg/haserl.control | 8 ++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/haserl/haserl.control create mode 100644 package/haserl/ipkg/haserl.control (limited to 'package/haserl') diff --git a/package/haserl/Makefile b/package/haserl/Makefile index a5c9a98264..e361d4504c 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -60,9 +60,9 @@ $(PKG_INSTALL_DIR)/usr/bin/haserl: $(PKG_BUILD_DIR)/.built install $(PKG_IPK): $(PKG_INSTALL_DIR)/usr/bin/haserl - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_IPK_DIR)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/ $(STRIP) $(PKG_IPK_DIR)/usr/bin/* $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) diff --git a/package/haserl/haserl.control b/package/haserl/haserl.control deleted file mode 100644 index 1ab2bdad5b..0000000000 --- a/package/haserl/haserl.control +++ /dev/null @@ -1,8 +0,0 @@ -Package: haserl -Priority: optional -Section: web -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/haserl/ -Description: a CGI wrapper to embed shell scripts in HTML documents diff --git a/package/haserl/ipkg/haserl.control b/package/haserl/ipkg/haserl.control new file mode 100644 index 0000000000..1ab2bdad5b --- /dev/null +++ b/package/haserl/ipkg/haserl.control @@ -0,0 +1,8 @@ +Package: haserl +Priority: optional +Section: web +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/haserl/ +Description: a CGI wrapper to embed shell scripts in HTML documents -- cgit v1.2.3