From: Matthew Newton <mcn4@leicester.ac.uk>
Date: Sat, 4 Feb 2012 00:31:06 +0000 (+0000)
Subject: minor fixes to debian packaging
X-Git-Tag: release_2_2_0~182^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=282c2dfb3d6438c1638dbd075cbfee0e2fa69fe1;p=thirdparty%2Ffreeradius-server.git

minor fixes to debian packaging

rlm_sql.libs.diff needed updating after libtool changes
chmod in debian/rules broke with umask set
ln -s in debian/rules stopped a rebuild working
debian/rules clean correctly wipes wimax makefile, which shouldn't be in git
---

diff --git a/debian/patches/rlm_sql.libs.diff b/debian/patches/rlm_sql.libs.diff
index fba93d759ec..ed993a52d4e 100644
--- a/debian/patches/rlm_sql.libs.diff
+++ b/debian/patches/rlm_sql.libs.diff
@@ -23,7 +23,7 @@
 @@ -8,7 +8,7 @@
  SRCS        = rlm_sqlippool.c
  HEADERS     = $(top_builddir)/src/modules/rlm_sql/rlm_sql.h
- RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql $(INCLTDL)
+ RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql
 -RLM_LIBS    =
 +RLM_LIBS    += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
  RLM_INSTALL =
@@ -33,7 +33,7 @@
 +++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
 @@ -4,5 +4,6 @@
  SRCS		= sql_postgresql.c
- RLM_SQL_CFLAGS	= @postgresql_cflags@ $(INCLTDL)
+ RLM_SQL_CFLAGS	= @postgresql_cflags@
  RLM_SQL_LIBS	= @postgresql_ldflags@
 +RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
  
@@ -42,7 +42,7 @@
 +++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
 @@ -4,5 +4,6 @@
  SRCS           = sql_iodbc.c
- RLM_SQL_CFLAGS = @sql_iodbc_cflags@ $(INCLTDL)
+ RLM_SQL_CFLAGS = @sql_iodbc_cflags@
  RLM_SQL_LIBS   = @sql_iodbc_ldflags@
 +RLM_LIBS      += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
  
@@ -51,7 +51,7 @@
 +++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
 @@ -4,5 +4,6 @@
  SRCS           = sql_mysql.c
- RLM_SQL_CFLAGS = @sql_mysql_cflags@ $(INCLTDL)
+ RLM_SQL_CFLAGS = @sql_mysql_cflags@
  RLM_SQL_LIBS   = @sql_mysql_ldflags@
 +RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
  
diff --git a/debian/rules b/debian/rules
index 398bbd185a7..36a103a3fd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,7 +153,7 @@ install-arch: build-arch-stamp
 	dh_testroot
 	dh_installdirs -s
 	test -d $(freeradius_dir)/usr/lib/freeradius || mkdir -p $(freeradius_dir)/usr/lib/freeradius
-	ln -s rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
+	ln -fs rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
 	$(MAKE) install R=$(freeradius_dir)
 	
 	# rename radius binary to play nicely with others
@@ -183,7 +183,7 @@ binary-common:
 	dh_installchangelogs doc/ChangeLog
 	dh_installdocs
 	dh_installexamples
-	chmod -x debian/freeradius/usr/share/doc/freeradius/examples/example.pl
+	chmod a-x debian/freeradius/usr/share/doc/freeradius/examples/example.pl
 	dh_installlogrotate	
 	dh_installpam --name=radiusd 
 	dh_installinit --noscripts
diff --git a/src/modules/rlm_wimax/Makefile b/src/modules/rlm_wimax/Makefile
deleted file mode 100644
index 5ef07913351..00000000000
--- a/src/modules/rlm_wimax/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET		= rlm_wimax
-SRCS		= rlm_wimax.c
-HEADERS		= 
-RLM_CFLAGS	=
-RLM_LIBS	= $(OPENSSL_LIBS)
-
-include ../rules.mak
-
-$(STATIC_OBJS): $(HEADERS)
-
-$(DYNAMIC_OBJS): $(HEADERS)