Incorporating review feedback from David Seifert.

[ppp.git] / pppd / plugins / radius / Makefile.am

diff --git a/pppd/plugins/radius/Makefile.am b/pppd/plugins/radius/Makefile.am
index 5655ad58c27a4209ad695cb94a47841464fb1c0f..c3cff2347b4d77e157c37fc5ecc7a521c8f47580 100644 (file)
--- a/pppd/plugins/radius/Makefile.am
+++ b/pppd/plugins/radius/Makefile.am
@@ -2,7 +2,7 @@ pppd_plugin_LTLIBRARIES = radius.la radattr.la radrealms.la
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 
 noinst_LTLIBRARIES = libradiusclient.la
-man8_MANS = pppd-radius.8 pppd-radattr.8
+dist_man8_MANS = pppd-radius.8 pppd-radattr.8
 noinst_HEADERS = \
     includes.h \
     options.h \
@@ -25,29 +25,29 @@ EXTRA_ETC = \
     etc/realms \
     etc/servers
 
-RADIUS_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd -DRC_LOG_FACILITY=LOG_DAEMON
-RADIUS_LDFLAGS = -module -avoid-version @LDFLAGS@
+RADIUS_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd -DRC_LOG_FACILITY=LOG_DAEMON
+RADIUS_LDFLAGS = -module -avoid-version $(LDFLAGS)
 
-radius_la_CFLAGS = $(RADIUS_CFLAGS)
+radius_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radius_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radius_la_SOURCES = radius.c
 radius_la_LIBADD = libradiusclient.la
 if WITH_OPENSSL
-radius_la_LIBADD += @OPENSSL_LIBS@
+radius_la_LIBADD += $(OPENSSL_LIBS)
 endif
 
-radattr_la_CFLAGS = $(RADIUS_CFLAGS)
+radattr_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radattr_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radattr_la_SOURCES = radattr.c
 
-radrealms_la_CFLAGS = $(RADIUS_CFLAGS)
+radrealms_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radrealms_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radrealms_la_SOURCES = radrealms.c
 
 libradiusclient_la_SOURCES = \
     avpair.c buildreq.c config.c dict.c ip_util.c \
        clientid.c sendserver.c lock.c util.c
-libradiusclient_la_CFLAGS = $(RADIUS_CFLAGS)
+libradiusclient_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 
 if !WITH_OPENSSL
 libradiusclient_la_SOURCES += md5.c
@@ -55,11 +55,10 @@ else
 if OPENSSL_HAVE_MD5
 libradiusclient_la_SOURCES += md5.c
 else
-libradiusclient_la_CFLAGS += @OPENSSL_INCLUDES@
+libradiusclient_la_CPPFLAGS += $(OPENSSL_INCLUDES)
 endif
 endif
 
 EXTRA_DIST = \
-    $(man8_MANS) \
     $(EXTRA_FILES) \
     $(EXTRA_ETC)