Upgrade xsupplicant to latest stable (1.2.8), fix redeclaration errors (#961)

[openwrt/svn-archive/archive.git] / net / maradns / Makefile

diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index d019f947dbaab859e891a2d50fed123bdbbc0d32..023ba86e326b33d43904b240a712d156b4a98b64 100644 (file)
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=maradns
 PKG_VERSION:=1.2.07.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=dc67f6a496e668127871382a40367733
 
-PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/
+PKG_MD5SUM:=dc67f6a496e668127871382a40367733
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -26,7 +27,6 @@ define Package/maradns
   CATEGORY:=Network
   DEPENDS:=+libpthread
   TITLE:=Small and secure DNS Server
-  DESCRIPTION:=A small and secure DNS server
   URL:=http://www.maradns.org/
 endef
 
@@ -35,7 +35,8 @@ define Package/maradns/conffiles
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+       # it's not GNU autoconf stuff
+       (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                ./configure \
        );
@@ -45,24 +46,26 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                FLAGS="$(TARGET_CFLAGS)" \
-               CC=$(TARGET_CC) \
-               HOSTCC="$(HOSTCC)"
+               CC="$(TARGET_CC)" \
+               HOSTCC="$(HOSTCC)" \
+               V=
        mkdir -p $(PKG_INSTALL_DIR)/usr/{bin,sbin}
        mkdir -p $(PKG_INSTALL_DIR)/usr/man/man{1,5,8}
        $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX="$(PKG_INSTALL_DIR)/usr" \
                RPM_BUILD_ROOT="$(PKG_INSTALL_DIR)" \
+               V= \
                install
 endef
 
 define Package/maradns/install 
-       install -d -m0755 $(1)/etc
-       install -m0644 ./files/mararc $(1)/etc/mararc
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/maradns.init $(1)/etc/init.d/S60maradns
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) ./files/mararc $(1)/etc/mararc
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/maradns.init $(1)/etc/init.d/maradns
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/
 endef