pass the CFLAGS through the environment on compile and fix a few packages

[openwrt.git] / package / keynote / Makefile

diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index c756747..ed4d4f0 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_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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -41,11 +42,7 @@ define Build/Configure
        )
 endef
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               CFLAGS="\$$$$(EXTRA_CFLAGS) \$$$$(EXTRA_LDFLAGS)" \
-       )
-endef
+EXTRA_CFLAGS += $(EXTRA_LDFLAGS)
 
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
@@ -55,13 +52,12 @@ define Build/InstallDev
 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
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
 endef