upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[openwrt.git] / package / keynote / Makefile

diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index c756747..9d97a96 100644 (file)
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=keynote
 PKG_VERSION:=2.3
 PKG_RELEASE:=1
 
 PKG_VERSION:=2.3
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
 PKG_CAT:=bzcat
 
 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
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 


@@ -34,16 +35,13 @@ define Package/keynote
   URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
 endef
 
   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, \
 
 define Build/Compile
        $(call Build/Compile/Default, \

-               CFLAGS="\$$$$(EXTRA_CFLAGS) \$$$$(EXTRA_LDFLAGS)" \
+               LIBS="$(EXTRA_LDFLAGS) -L. -lkeynote -lm -lcrypto" \

        )
 endef
 
        )
 endef
 


@@ -55,13 +53,12 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf \
-               $(STAGING_DIR)/usr/include/keynote \
+       rm -rf  $(STAGING_DIR)/usr/include/keynote \

                $(STAGING_DIR)/usr/lib/libkeynote.a
 endef
 
 define Package/keynote/install
                $(STAGING_DIR)/usr/lib/libkeynote.a
 endef
 
 define Package/keynote/install

-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
 endef