fixed another bug.. now v060 Signed-off-by: Michael Vogt <michu at neophob.com>

[openwrt/svn-archive/archive.git] / libs / libnet-1.1.x / Makefile

diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile
index a8c204095a0416b3e569caeac228a0b298eab30c..b60939ab72e5a883caa2600f657861310eb9c0ff 100644 (file)
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/
 PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -35,6 +34,16 @@ 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=linux
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR); touch \
                configure.in \
@@ -43,34 +52,24 @@ define Build/Configure
                Makefile.in \
                configure \
        );
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --with-pf_packet=yes \
-               , \
-               ac_cv_libnet_endianess=$(ENDIANESS) \
-               ac_libnet_have_pf_packet=yes \
-               ac_libnet_have_packet_socket=yes \
-       )
+       $(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.1.x/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/lib/libnet-1.1.x/bin/
-       mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.1.x/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/lib/libnet-1.1.x/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf $(STAGING_DIR)/usr/lib/libnet-1.1.x
+       mkdir -p $(1)/usr/lib/libnet-1.1.x/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/
+       mkdir -p $(1)/usr/lib/libnet-1.1.x/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/
+       mkdir -p $(1)/usr/lib/libnet-1.1.x/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.1.x/lib/
 endef
 
 define Package/libnet1/install