add missing dependency on freeradius to freeradius-mod-radutmp, tweak makefile

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

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index a5896887c80cf006601a122c487c3b3ed3b85615..b0ced476c4e99536c9cb3e748c832473191e4157 100644 (file)
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/old/ \
        ftp://ftp.uk.freeradius.org/pub/radius/
 PKG_MD5SUM:=2c29ab90cc30aa3b92fbd78030ccc198
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/freeradius/Default
@@ -198,6 +195,7 @@ endef
 
 define Package/freeradius-mod-radutmp
   $(call Package/freeradius/Default)
+  DEPENDS:=freeradius
   TITLE:=Radius UTMP module
 endef
 
@@ -207,7 +205,9 @@ define Package/freeradius-utils
   TITLE:=Misc. client utilities
 endef
 
-PKG_CONFIGURE_ARGS:= \
+CONFIGURE_ARGS+= \
+       --libdir=/usr/lib/freeradius \
+       --libexecdir=/usr/lib/freeradius \
        --enable-shared \
        --disable-static \
        --disable-developer \
@@ -253,76 +253,69 @@ PKG_DICTIONARIES:= \
        wispr \
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-ldap),)
-  PKG_CONFIGURE_ARGS+= \
+  CONFIGURE_ARGS+= \
                --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
                --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
-  PKG_CONFIGURE_LIBS+= -lcrypto -lssl
+  CONFIGURE_LIBS+= -lcrypto -lssl
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_ldap
+  CONFIGURE_ARGS+= --without-rlm_ldap
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-mysql),)
-  PKG_CONFIGURE_ARGS+= \
+  CONFIGURE_ARGS+= \
                --with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
                --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" \
                --without-threads
-  PKG_CONFIGURE_LIBS+= -lz
+  CONFIGURE_LIBS+= -lz
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_sql_mysql
+  CONFIGURE_ARGS+= --without-rlm_sql_mysql
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-pgsql),)
-  PKG_CONFIGURE_ARGS+= \
+  CONFIGURE_ARGS+= \
                --with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \
                --with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib"
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_sql_postgresql
+  CONFIGURE_ARGS+= --without-rlm_sql_postgresql
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-peap),)
-  PKG_CONFIGURE_ARGS+= --with-rlm_eap_peap
-  PKG_CONFIGURE_LIBS+= -lcrypto -lssl
+  CONFIGURE_ARGS+= --with-rlm_eap_peap
+  CONFIGURE_LIBS+= -lcrypto -lssl
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_eap_peap
+  CONFIGURE_ARGS+= --without-rlm_eap_peap
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-tls),)
-  PKG_CONFIGURE_ARGS+= --with-rlm_eap_tls
-  PKG_CONFIGURE_LIBS+= -lcrypto -lssl
+  CONFIGURE_ARGS+= --with-rlm_eap_tls
+  CONFIGURE_LIBS+= -lcrypto -lssl
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_eap_tls
+  CONFIGURE_ARGS+= --without-rlm_eap_tls
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-ttls),)
-  PKG_CONFIGURE_ARGS+= --with-rlm_eap_ttls
-  PKG_CONFIGURE_LIBS+= -lcrypto -lssl
+  CONFIGURE_ARGS+= --with-rlm_eap_ttls
+  CONFIGURE_LIBS+= -lcrypto -lssl
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_eap_ttls
+  CONFIGURE_ARGS+= --without-rlm_eap_ttls
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-attr-rewrite),)
-  PKG_CONFIGURE_ARGS+= --with-rlm_attr-rewrite
+  CONFIGURE_ARGS+= --with-rlm_attr-rewrite
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_attr-rewrite
+  CONFIGURE_ARGS+= --without-rlm_attr-rewrite
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-radutmp),)
-  PKG_CONFIGURE_ARGS+= --with-rlm_radutmp
+  CONFIGURE_ARGS+= --with-rlm_radutmp
 else
-  PKG_CONFIGURE_ARGS+= --without-rlm_radutmp
+  CONFIGURE_ARGS+= --without-rlm_radutmp
 endif
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --libdir=/usr/lib/freeradius \
-               --libexecdir=/usr/lib/freeradius \
-               $(PKG_CONFIGURE_ARGS) \
-               , \
-               LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
-               LIBS="$(PKG_CONFIGURE_LIBS)" \
-               MYSQL_CONFIG="no" \
-       )
-endef
+CONFIGURE_VARS+= \
+       LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
+       LIBS="$(CONFIGURE_LIBS)" \
+       MYSQL_CONFIG="no" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -346,7 +339,7 @@ define Package/freeradius/install
        $(INSTALL_DIR) $(1)/usr/lib/freeradius
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd
 endef
@@ -363,7 +356,7 @@ endef
 define Package/freeradius-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
        for f in radclient radeapclient; do \
-               $(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \
+               $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \
        done
 endef