X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkeynote%2FMakefile;h=787c19deb7125d6c78496fd89d37f221b2dbbd26;hb=542b8fd8eabb69b852010b3280e1904c4888bad3;hp=38f1f6901d969de2dfdd2feb3b02e48841e58719;hpb=8afb23270d23db6a033ba8fb77e1cf1a1d925a7c;p=openwrt.git

diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 38f1f6901d..787c19deb7 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 4619 2006-08-22 09:50:02Z florian $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -15,12 +15,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/keynote
   SECTION:=net
@@ -35,22 +31,16 @@ define Package/keynote
   URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-static \
-		--enable-shared \
-	)
-endef
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared
 
-define Build/Compile
-	$(call Build/Compile/Default, \
-		CFLAGS="\$$$$(EXTRA_CFLAGS) \$$$$(EXTRA_LDFLAGS)" \
-	)
-endef
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/include/keynote
+	$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/keynote/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/
 endef
@@ -61,8 +51,8 @@ define Build/UninstallDev
 endef
 
 define Package/keynote/install
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,keynote))