remove PKG_CAT from packages

[packages.git] / libs / libnet-1.0.x / Makefile

diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index e4343c6..e1ae54a 100644 (file)
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -31,16 +30,20 @@ define Package/libnet0
 endef
 
 ENDIANESS:=lil
-ifeq ($(ARCH),mips)
-  ENDIANESS:=big
-endif
-ifeq ($(ARCH),armeb)
-  ENDIANESS:=big
-endif
-ifeq ($(ARCH),powerpc)
+ifeq ($(CONFIG_BIG_ENDIAN),y)
   ENDIANESS:=big
 endif
 
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --with-pf_packet=yes
+
+CONFIGURE_VARS += \
+       ac_cv_libnet_endianess=$(ENDIANESS) \
+       ac_libnet_have_pf_packet=yes \
+       LL_INT_TYPE=sockpacket
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR); touch \
                configure.in \
@@ -49,30 +52,24 @@ define Build/Configure
                Makefile.in \
                configure \
        );
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --with-pf_packet=yes \
-               , \
-               ac_libnet_have_pf_packet=yes \
-               ac_cv_lbl_unaligned_fail=no \
-               ac_cv_libnet_endianess=$(ENDIANESS) \
-       )
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile
+       # pass CFLAGS again to override -O2 set by configure
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               CFLAGS="$(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/
-       mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/lib/libnet-1.0.x/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib/
+       mkdir -p $(1)/usr/lib/libnet-1.0.x/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/
+       mkdir -p $(1)/usr/lib/libnet-1.0.x/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/
+       mkdir -p $(1)/usr/lib/libnet-1.0.x/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.0.x/lib/
 endef
 
 define Build/UninstallDev
@@ -80,7 +77,7 @@ define Build/UninstallDev
 endef
 
 define Package/libnet0/install
-       install -m0755 -d $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/
 endef