From: Stefan Schantl <Stevee@ipfire.org>
Date: Tue, 8 Sep 2009 15:49:14 +0000 (+0200)
Subject: Rename package freeradius to freeradius-server.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e5a87c90c069e2333f2c8db680dd99d29bdb2ff;p=ipfire-3.x.git

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 ec4470966..82a260faa 100644
--- 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 c10df23c1..606322ded 100755
--- 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
 	#