[packages] Require* calls must now be placed before BuildPackage calls

[openwrt/svn-archive/archive.git] / lang / perl / Makefile

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index d5dce3022b3e5303cbfa6b9882510a970ca29751..e3cedd2af74acbda97e8be8eadd52ba53b8ca03a 100644 (file)
--- a/lang/perl/Makefile
+++ b/lang/perl/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
 
@@ -21,7 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -103,14 +101,14 @@ define Build/perl/Configure
        -$(MAKE) -C $(PKG_BUILD_DIR) clean
        sed \
                -e 's!%%CC%%!$(TARGET_CC)!g' \
-               -e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include!g' \
+               -e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE $(TARGET_CPPFLAGS)!g' \
                -e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
                -e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
                -e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
-               -e 's!%%LDFLAGS%%!-rdynamic -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib!g' \
+               -e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
                -e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
                -e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
-               files/config.sh-$(REAL_GNU_TARGET_NAME).in \
+               files/config.sh-$(patsubst i386,i486,$(ARCH)).in \
                > $(PKG_BUILD_DIR)/config.sh
        (cd $(PKG_BUILD_DIR) && ./Configure -S)
 endef
@@ -180,6 +178,16 @@ endef
 endif
 $(eval $(Build/perl))
 
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+$(eval $(call RequireCommand,rsync, \
+       $(PKG_NAME) requires rsync installed on the host-system. \
+))
+
 $(eval $(call BuildPackage,microperl))
 $(eval $(call BuildPackage,perl))