Incorporating review feedback from David Seifert.

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>

diff --git a/Makefile.am b/Makefile.am
index 508c92b3ba561e5b3b1c4c18b16b470ff26205cd..275bca1dae55eebb7b499657a8165d2c579db6ef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,16 +13,16 @@ DIST_SUBDIRS = $(SUBDIRS) common include modules scripts
 #   This is to work around the kernel module for PPP on Sun Solaris
 if SUNOS
 all-am:
-       (cd solaris ; make -f Makefile)
+       (cd solaris ; $(MAKE) -f Makefile)
 
 clean-generic:
-       (cd solaris ; make -f Makefile clean)
+       (cd solaris ; $(MAKE) -f Makefile clean)
 
 install-am:
-       (cd solaris ; make -f Makefile install)
+       (cd solaris ; $(MAKE) -f Makefile install)
 endif
 
-sampledir = $(sysconfdir)/@PACKAGE@
+sampledir = $(sysconfdir)/$(PACKAGE)
 
 sample_DATA = \
     etc.ppp/options \

diff --git a/chat/Makefile.am b/chat/Makefile.am
index 58af42eafd75fc34dabca346719799acf987b3f7..0a2986934a1eb667b0b945a4fd57f86206217bfc 100644 (file)
--- a/chat/Makefile.am
+++ b/chat/Makefile.am
@@ -1,9 +1,5 @@
-
 sbin_PROGRAMS = chat
-man8_MANS = chat.8
+dist_man8_MANS = chat.8
 
 chat_SOURCES = chat.c
-chat_CFLAGS = -DTERMIOS -DSIGTYPE=void -UNO_SLEEP -DFNDELAY=O_NDELAY
-
-EXTRA_DIST = \
-    $(man8_MANS)
+chat_CPPFLAGS = -DTERMIOS -DSIGTYPE=void -UNO_SLEEP -DFNDELAY=O_NDELAY

diff --git a/configure b/configure
index 1e6e794cc0849aaea92b302dba2381d96f497865..d8546799da2e7c8f18928dd398e062721dcbd831 100755 (executable)
--- a/configure
+++ b/configure
@@ -158,7 +158,7 @@ if [ -d "$ksrc" ]; then
        if [ ${HAVE_INCDIR_PARAM:-0} -ne 1 ] ; then
            INCDIR='${prefix}'/include
        fi
-       mkmkf pppd/pppd.pc.in pppd/pppd.pc
+       mkmkf $ksrc/pppd.pc.in pppd/pppd.pc
     fi
 else
   echo "Unable to locate kernel source $ksrc"

diff --git a/contrib/pppgetpass/Makefile.am b/contrib/pppgetpass/Makefile.am
index 74663961feae325e727b96d40af5ca39289b5cc4..923199554a9e92ac676780caa6809ce803350d32 100644 (file)
--- a/contrib/pppgetpass/Makefile.am
+++ b/contrib/pppgetpass/Makefile.am
@@ -1,18 +1,17 @@
 noinst_PROGRAMS = pppgetpass.vt
-man8_MANS = pppgetpass.8
+dist_man8_MANS = pppgetpass.8
 
 pppgetpass_vt_SOURCES = pppgetpass.vt.c
-pppgetpass_vt_CFLAGS = -Wno-unused-result
+pppgetpass_vt_CPPFLAGS = -Wno-unused-result
 
 if WITH_GTK
 noinst_PROGRAMS += pppgetpass.gtk
 
 pppgetpass_gtk_SOURCES = pppgetpass.gtk.c
-pppgetpass_gtk_CFLAGS  = -Wno-deprecated-declarations -Wno-discarded-qualifiers
-pppgetpass_gtk_CFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@
-pppgetpass_gtk_LDADD   = @GLIB_LIBS@ @GTK_LIBS@
+pppgetpass_gtk_CPPFLAGS = -Wno-deprecated-declarations -Wno-discarded-qualifiers
+pppgetpass_gtk_CPPFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS)
+pppgetpass_gtk_LDADD = $(GLIB_LIBS) $(GTK_LIBS)
 endif
 
 EXTRA_DIST = \
-    pppgetpass.sh \
-    $(man8_MANS)
+    pppgetpass.sh

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index fc70b0e32bdda2df39b18f85b1114096a8595bcb..1766f050de0d359886588a793430cdcd5cff03c5 100644 (file)
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -1,5 +1,5 @@
 sbin_PROGRAMS = pppd
-man8_MANS = pppd.8 srp-entry.8
+dist_man8_MANS = pppd.8 srp-entry.8
 if WITH_SRP
 sbin_PROGRAMS += srp-entry
 endif
@@ -57,13 +57,13 @@ pppd_SOURCES = \
     upap.c \
     utils.c
 
-pppd_CFLAGS = -I${top_srcdir}/include -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+pppd_CPPFLAGS = -I${top_srcdir}/include -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
 pppd_LDFLAGS =
 pppd_LIBS =
 
 if LINUX
 pppd_SOURCES += sys-linux.c
-pppd_LIBS += @CRYPT_LIBS@ @UTIL_LIBS@
+pppd_LIBS += $(CRYPT_LIBS) $(UTIL_LIBS)
 endif
 
 if SUNOS
@@ -93,13 +93,13 @@ pppd_SOURCES += mppe.c
 endif
 
 if WITH_PCAP
-pppd_CFLAGS += @PCAP_CFLAGS@
-pppd_LDFLAGS += @PCAP_LDFLAGS@
-pppd_LIBS += @PCAP_LIBS@
+pppd_CPPFLAGS += $(PCAP_CFLAGS)
+pppd_LDFLAGS += $(PCAP_LDFLAGS)
+pppd_LIBS += $(PCAP_LIBS)
 endif
 
 if WITH_PLUGINS
-pppd_CFLAGS += -DPPPD_PLUGIN_DIR='"@PPPD_PLUGIN_DIR@"'
+pppd_CPPFLAGS += -DPPPD_PLUGIN_DIR='"@PPPD_PLUGIN_DIR@"'
 pppd_LIBS += -ldl
 if LINUX
 pppd_LDFLAGS += -Wl,-E
@@ -129,9 +129,9 @@ endif
 if !WITH_OPENSSL
 pppd_SOURCES += md5.c md4.c sha1.c
 else
-pppd_CFLAGS += @OPENSSL_INCLUDES@
-pppd_LDFLAGS += @OPENSSL_LDFLAGS@
-pppd_LIBS += @OPENSSL_LIBS@
+pppd_CPPFLAGS += $(OPENSSL_INCLUDES)
+pppd_LDFLAGS += $(OPENSSL_LDFLAGS)
+pppd_LIBS += $(OPENSSL_LIBS)
 if !OPENSSL_HAVE_SHA
 pppd_SOURCES += sha1.c
 endif
@@ -149,17 +149,16 @@ endif
 
 if WITH_SRP
 srp_entry_SOURCES = srp-entry.c
-srp_entry_CFLAGS = @OPENSSL_INCLUDES@ @SRP_CFLAGS@
-srp_entry_LDADD = @SRP_LIBS@ @OPENSSL_LIBS@ 
-srp_entry_LDFLAGS = @OPENSSL_LDFLAGS@ @SRP_LDFLAGS@
+srp_entry_CPPFLAGS = $(OPENSSL_INCLUDES) $(SRP_CFLAGS)
+srp_entry_LDADD = $(SRP_LIBS) $(OPENSSL_LIBS)
+srp_entry_LDFLAGS = $(OPENSSL_LDFLAGS) $(SRP_LDFLAGS)
 
-pppd_CFLAGS += @SRP_CFLAGS@
-pppd_LDFLAGS += @SRP_LDFLAGS@
-pppd_LIBS += @SRP_LIBS@
+pppd_CPPFLAGS += $(SRP_CFLAGS)
+pppd_LDFLAGS += $(SRP_LDFLAGS)
+pppd_LIBS += $(SRP_LIBS)
 endif
 
 pppd_LDADD = $(pppd_LIBS)
 
 EXTRA_DIST = \
-    $(man8_MANS) \
     ppp.pam

diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am
index b08d4a2115b363049812ff68571b061581f6cdfe..cfc9164bcd27cd2056f73ebd97059bc652e56f18 100644 (file)
--- a/pppd/plugins/Makefile.am
+++ b/pppd/plugins/Makefile.am
@@ -1,22 +1,22 @@
 pppd_plugin_LTLIBRARIES = minconn.la passprompt.la passwordfd.la winbind.la
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 
-PLUGIN_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
+PLUGIN_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
 PLUGIN_LDFLAGS = -module -avoid-version
 
-minconn_la_CFLAGS = $(PLUGIN_CFLAGS)
+minconn_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
 minconn_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 minconn_la_SOURCES = minconn.c
 
-passprompt_la_CFLAGS = $(PLUGIN_CFLAGS)
+passprompt_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
 passprompt_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 passprompt_la_SOURCES = passprompt.c
 
-passwordfd_la_CFLAGS = $(PLUGIN_CFLAGS)
+passwordfd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
 passwordfd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 passwordfd_la_SOURCES = passwordfd.c
 
-winbind_la_CFLAGS = $(PLUGIN_CFLAGS)
+winbind_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
 winbind_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 winbind_la_SOURCES = winbind.c
 

diff --git a/pppd/plugins/pppoatm/Makefile.am b/pppd/plugins/pppoatm/Makefile.am
index a13baea0826004395469016698a8a09e8bb3c506..66119c95b271aa511fab8d2f23f2c837a848aca7 100644 (file)
--- a/pppd/plugins/pppoatm/Makefile.am
+++ b/pppd/plugins/pppoatm/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = \
     atmres.h \
     atmsap.h
 
-pppoatm_la_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
+pppoatm_la_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
 pppoatm_la_LDFLAGS = -module -avoid-version
 pppoatm_la_SOURCES = pppoatm.c
 

diff --git a/pppd/plugins/pppoe/Makefile.am b/pppd/plugins/pppoe/Makefile.am
index d0c89c5f2a4295be04215983e9781585150bf550..9c0f0fe041a9feeea27c6877de971335caf782ac 100644 (file)
--- a/pppd/plugins/pppoe/Makefile.am
+++ b/pppd/plugins/pppoe/Makefile.am
@@ -1,21 +1,18 @@
 pppd_plugin_LTLIBRARIES = pppoe.la 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 sbin_PROGRAMS = pppoe-discovery
-man8_MANS = pppoe-discovery.8
+dist_man8_MANS = pppoe-discovery.8
 
 noinst_HEADERS = \
     pppoe.h
 
-pppoe_la_CFLAGS = -I${top_srcdir} -I${top_srcdir}/include
+pppoe_la_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
 pppoe_la_LDFLAGS = -module -avoid-version
 pppoe_la_SOURCES = plugin.c discovery.c if.c common.c
 
-pppoe_discovery_CFLAGS = -I${top_srcdir} -I${top_srcdir}/include
+pppoe_discovery_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
 pppoe_discovery_SOURCES = pppoe-discovery.c debug.c
 
-EXTRA_DIST = \
-    $(man8_MANS)
-
 install-exec-hook:
        (mkdir -p $(DESTDIR)/$(pppd_plugindir); \
         cd $(DESTDIR)$(pppd_plugindir); \

diff --git a/pppd/plugins/pppol2tp/Makefile.am b/pppd/plugins/pppol2tp/Makefile.am
index 3422e4ef2ceb4184174b677202f28b7305b7b8c4..999f35b3b1881454e9d56f38703351679b6fcf79 100644 (file)
--- a/pppd/plugins/pppol2tp/Makefile.am
+++ b/pppd/plugins/pppol2tp/Makefile.am
@@ -4,10 +4,10 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
 noinst_HEADERS = \
     l2tp_event.h
 
-pppol2tp_la_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
+pppol2tp_la_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
 pppol2tp_la_LDFLAGS = -module -avoid-version
 pppol2tp_la_SOURCES = pppol2tp.c
 
-openl2tp_la_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
+openl2tp_la_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd
 openl2tp_la_LDFLAGS = -module -avoid-version
 openl2tp_la_SOURCES = openl2tp.c

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)

diff --git a/pppdump/Makefile.am b/pppdump/Makefile.am
index cab9d8a89fa18ac56a16f09f62bd1e12d65fa70e..2df7e0edd190d0db6021f51bfe82f7185f886c03 100644 (file)
--- a/pppdump/Makefile.am
+++ b/pppdump/Makefile.am
@@ -1,5 +1,5 @@
 sbin_PROGRAMS = pppdump
-man8_MANS = pppdump.8
+dist_man8_MANS = pppdump.8
 
 pppdump_SOURCES = pppdump.c bsd-comp.c deflate.c zlib.c
 pppdump_CFLAGS = -I${top_srcdir}/include/net
@@ -7,6 +7,3 @@ pppdump_CFLAGS = -I${top_srcdir}/include/net
 noinst_HEADERS = \
     ppp-comp.h \
     zlib.h
-
-EXTRA_DIST = \
-    $(man8_MANS)

diff --git a/pppstats/Makefile.am b/pppstats/Makefile.am
index 560ed68d895c33a551a23186a6ebc8df25ca2685..d7d74e0200abc68407a0dde1c06614a63ed3b60c 100644 (file)
--- a/pppstats/Makefile.am
+++ b/pppstats/Makefile.am
@@ -1,16 +1,14 @@
 sbin_PROGRAMS = pppstats
-man8_MANS = pppstats.8
+dist_man8_MANS = pppstats.8
 
 pppstats_SOURCES = pppstats.c
 pppstats_CFLAGS =
+pppstats_CPPFLAGS =
 
 if LINUX
 pppstats_CFLAGS += -I${top_srcdir}/include
 endif
 
 if SUNOS
-pppstats_CFLAGS += -DSTREAMS
+pppstats_CPPFLAGS += -DSTREAMS
 endif
-
-EXTRA_DIST = \
-    $(man8_MANS)