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 24d3af43da409aeb20d21b034e038c8f88bb1c9a..81bba217f5fdcfff3cd92c3dd6a7377f206b9e4d 100644 (file)
--- a/libs/libdnet/Makefile
+++ b/libs/libdnet/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=libdnet
 PKG_VERSION:=1.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=416b765e9d9961501ac85e9a366fd219
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,73 +26,44 @@ define Package/libdnet
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level network library
-  DESCRIPTION:=Low-level network library.\\\
-    libdnet is a library of simplified, portable interface to several \\\
-    low-level networking routines.
+  DESCRIPTION:=\
+       libdnet is a library of simplified, portable interface to several \\\
+       low-level networking routines.
   URL:=http://sourceforge.net/projects/libdnet/
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               touch configure.in; \
-               touch include.m4; \
-               touch aclocal.m4; \
-               touch Makefile.in; \
-               touch configure; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var/run \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-shared \
-                       --enable-static \
-       );
+define Package/pydnet
+  SECTION:=libs
+  DEPENDS:=libdnet +python
+  CATEGORY:=Libraries
+  TITLE:=Low-level network library
+  DESCRIPTION:=\
+       libdnet is a library of simplified, portable interface to several \\\
+       low-level networking routines.
+  URL:=http://sourceforge.net/projects/libdnet/
 endef
 
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --without-check \
+       --without-python
+               
+CONFIGURE_VARS += \
+       ac_cv_dnet_bsd_bpf=no
 
-define Package/libdnet/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/
-       install -m0755 -d $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
-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
@@ -103,4 +74,22 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/libdnet.{a,so*}
 endef
 
+define Package/libdnet/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
+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/
+endef
+
+
 $(eval $(call BuildPackage,libdnet))
+$(eval $(call BuildPackage,pydnet))