InstallDev should be using (1) and not (STAGING_DIR)

[openwrt/svn-archive/archive.git] / libs / libdnet / Makefile

diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile
index bf0331ebfdca77f4aeea3c482ede7299a589e082..81bba217f5fdcfff3cd92c3dd6a7377f206b9e4d 100644 (file)
--- a/libs/libdnet/Makefile
+++ b/libs/libdnet/Makefile
@@ -43,38 +43,27 @@ define Package/pydnet
   URL:=http://sourceforge.net/projects/libdnet/
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); touch \
-               configure.in \
-               include.m4 \
-               aclocal.m4 \
-               Makefile.in \
-               configure \
-       );
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --without-check \
-               --without-python \
-               , \
-               ac_cv_dnet_bsd_bpf=no \
-       )
-endef
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --without-check \
+       --without-python
+               
+CONFIGURE_VARS += \
+       ac_cv_dnet_bsd_bpf=no
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+MAKE_FLAGS += \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/
+       mkdir -p $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(1)/usr/lib/
 endef
 
 define Build/UninstallDev
@@ -95,6 +84,7 @@ endef
 define Package/pydnet/install
        $(INSTALL_DIR) $(1)/usr/lib
        cd $(PKG_BUILD_DIR)/python; \
+       CFLAGS="$(TARGET_CFLAGS)" \
        $(STAGING_DIR)/usr/bin/hostpython ./setup.py install \
                --no-compile --prefix $(PKG_INSTALL_DIR)/usr
        cp -a $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/