[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/includ...

[openwrt/svn-archive/archive.git] / net / bitchx / Makefile

diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile
index 3e44b59e5eb468bcacef2e1038a0e393867c5179..e8bcae490d7e55a46392a8ae70a6c78d61c75abd 100644 (file)
--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -17,7 +16,6 @@ PKG_SOURCE_URL:=http://bitchx.org/files/source/
 PKG_MD5SUM:=611d2dda222f00c10140236f4c331572
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/BitchX
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DEPENDS:=libncurses
 
@@ -36,7 +34,7 @@ define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all
        mkdir -p $(PKG_INSTALL_DIR)/tmp
@@ -65,9 +63,9 @@ endef
 
 define Package/bitchx/install
        $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/
        $(CP) $(PKG_INSTALL_DIR)/tmp/.bitchxrc $(1)/tmp
 endef