From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 27 Jan 2012 09:35:09 +0000 (+0100)
Subject: Correctly determine TARGET
X-Git-Tag: release_3_0_0_beta0~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cfcd5b0cdffaf9e644d9b282e7a4fa87b450f59;p=thirdparty%2Ffreeradius-server.git

Correctly determine TARGET

Don't just blindly append a ".a" to it
---

diff --git a/src/modules/rlm_krb5/all.mk.in b/src/modules/rlm_krb5/all.mk.in
index 7fb55ec4327..791cf7b4d2f 100644
--- a/src/modules/rlm_krb5/all.mk.in
+++ b/src/modules/rlm_krb5/all.mk.in
@@ -1,4 +1,9 @@
-TARGET		= @targetname@.a
+TARGETNAME	= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		= $(TARGETNAME).a
+endif
+
 SOURCES		= rlm_krb5.c
 
 SRC_CFLAGS	= @krb5_cflags@
diff --git a/src/modules/rlm_ldap/all.mk.in b/src/modules/rlm_ldap/all.mk.in
index 9854a3c031f..274765011f4 100644
--- a/src/modules/rlm_ldap/all.mk.in
+++ b/src/modules/rlm_ldap/all.mk.in
@@ -1,4 +1,9 @@
-TARGET		= rlm_ldap.a
+TARGETNAME	= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		= $(TARGETNAME).a
+endif
+
 SOURCES		= rlm_ldap.c @edir@
 
 SRC_CFLAGS	= @ldap_cflags@
diff --git a/src/modules/rlm_pam/all.mk.in b/src/modules/rlm_pam/all.mk.in
index 81cd742ee3f..59883d4279f 100644
--- a/src/modules/rlm_pam/all.mk.in
+++ b/src/modules/rlm_pam/all.mk.in
@@ -1,4 +1,9 @@
-TARGET		= @targetname@.a
+TARGETNAME	= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		= $(TARGETNAME).a
+endif
+
 SOURCES		= rlm_pam.c
 
 SRC_CFLAGS	= @pam_cflags@
diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index 2fcd156e149..f697657d0bc 100644
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -1,4 +1,9 @@
-TARGET		= @targetname@.a
+TARGETNAME	= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		= $(TARGETNAME).a
+endif
+
 SOURCES		= rlm_perl.c
 
 SRC_CFLAGS	= @perl_cflags@
diff --git a/src/modules/rlm_python/all.mk.in b/src/modules/rlm_python/all.mk.in
index ebc8204c976..19bfedc66b4 100644
--- a/src/modules/rlm_python/all.mk.in
+++ b/src/modules/rlm_python/all.mk.in
@@ -1,4 +1,9 @@
-TARGET		= @targetname.a
+TARGETNAME	= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		= $(TARGETNAME).a
+endif
+
 SOURCES		= rlm_python.c
 
 TGT_LDLIBS	= @python_ldflags@