fix perl compile on 8.09

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

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index d5dce3022b3e5303cbfa6b9882510a970ca29751..1dd1490f841d94c9f43caaa1309c8f6898017de2 100644 (file)
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -21,7 +21,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
 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
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -110,7 +109,7 @@ define Build/perl/Configure
                -e 's!%%LDFLAGS%%!-rdynamic -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib!g' \
                -e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
                -e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
                -e 's!%%LDFLAGS%%!-rdynamic -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib!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
                > $(PKG_BUILD_DIR)/config.sh
        (cd $(PKG_BUILD_DIR) && ./Configure -S)
 endef


@@ -180,7 +179,17 @@ endef
 endif
 $(eval $(Build/perl))
 
 endif
 $(eval $(Build/perl))
 

+define Build/Configure
+endef
+
+define Build/Compile
+endef
+

 $(eval $(call BuildPackage,microperl))
 $(eval $(call BuildPackage,perl))
 
 $(eval $(call BuildPackage,microperl))
 $(eval $(call BuildPackage,perl))
 

+$(eval $(call RequireCommand,rsync, \
+       $(PKG_NAME) requires rsync installed on the host-system. \
+))
+

 -include perlbase.mk
 -include perlbase.mk