Rename package freeradius to freeradius-server.

diff --git a/config/pam.d/freeradius b/config/pam.d/freeradius-server
similarity index 100%
rename from config/pam.d/freeradius
rename to config/pam.d/freeradius-server

diff --git a/lfs/freeradius b/lfs/freeradius-server
similarity index 91%
rename from lfs/freeradius
rename to lfs/freeradius-server
index ec4470966b76ae6fce6d8918b53fbf08b7fcf600..82a260faada5bbeba0d6587fc0b31b7de74e0b02 100644 (file)
--- a/lfs/freeradius
+++ b/lfs/freeradius-server
@@ -24,7 +24,7 @@
 
 include Config
 
-PKG_NAME   = freeradius
+PKG_NAME   = freeradius-server
 PKG_VER    = 2.1.6
 PKG_REL    = 0
 
@@ -54,8 +54,6 @@ define LONG_DESC
        Network Access Servers to perform authentication for dial-up users.
 endef
 
-CFLAGS     = LIBTOOL="libtool --tag=CC"
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -86,17 +84,18 @@ $(OBJECT): $(objects)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && \
                ./configure \
-                       $(CONFIGURE_ARCH) \
-                               --with-system-libtool \
-                               --libdir=/usr/lib/freeradius \ 
-                               --with-gnu-ld \ 
-                               --prefix=/usr \
-                               --with-threads \
-                               --with-thread-pool \ 
-                               --disable-ltdl-install
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+                        $(CONFIGURE_ARCH) \
+                       --with-gnu-ld \
+                       --with-system-libtool \
+                       --libdir=/usr/lib/freeradius \ 
+                       --prefix=/usr \
+                       --with-threads \
+                       --with-thread-pool \ 
+                       --disable-ltdl-install 
+       cd $(DIR_APP) && make LIBTOOL="libtool --tag=CC"
        cd $(DIR_APP) && make install
 
+       # PAM
        cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
 
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index c10df23c12b8133a3d9a880a4120eec21ff6cfed..606322ded026564a6df58a3e28a867f10e138465 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -309,7 +309,6 @@ ipfire_build() {
        ipfire_make libgssglue
        ipfire_make librpcsecgss
        ipfire_make gperf
-       ipfire_make freeradius
        
        ### Building vpn stuff
        #
@@ -442,6 +441,7 @@ misc_build() {
        #ipfire_make alsa
        ipfire_make portmap
        ipfire_make nfs-utils
+       ipfire_make freeradius-server
 
        ### Debugging
        #