[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-145-g0b06c88

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0b06c88a50954e0671f834985a38bbe2a53881f4 (commit)
      from  4d2aaa93c549f6f8951cfea2ec0f2ac347e8f77d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0b06c88a50954e0671f834985a38bbe2a53881f4


commit 0b06c88a50954e0671f834985a38bbe2a53881f4
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Aug 9 09:41:16 2012 +0200

    Update makefile templates.

diff --git a/ChangeLog b/ChangeLog
index 897434f..a06663d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-09  Mats Erik Andersson  <address@hidden>
+
+       Make building successful on FreeBSD 9.0.
+
+       * paths (PATH_UTMP): Add `/var/run/utx.active'.
+       (PATH_WTMP): Add `/var/log/utx.log'.
+       * src/Makefile.am (AM_CPPFLAGS): Add $(PATHDEF_UTMPX).
+       * talkd/Makefile.am (AM_CPPFLAGS): Add $(PATHDEF_UTMP)
+       and $(PATHDEF_UTMPX).
+
 2012-08-08  Mats Erik Andersson  <address@hidden>
 
        telnet: Support k5login authorization.
diff --git a/paths b/paths
index 7e6a24f..6afb639 100644
--- a/paths
+++ b/paths
@@ -83,9 +83,9 @@ PATH_FTPDPID  $(localstatedir)/run/ftpd.pid
 PATH_INETDCONF $(sysconfdir)/inetd.conf
 PATH_INETDDIR  $(sysconfdir)/inetd.d
 PATH_INETDPID  $(localstatedir)/run/inetd.pid
-PATH_UTMP      <utmp.h> <utmp.h>:UTMP_FILE $(localstatedir)/run/utmp 
search:utmp:/var/run:/var/adm:/etc
+PATH_UTMP      <utmp.h> <utmp.h>:UTMP_FILE $(localstatedir)/run/utmp 
search:utmp:/var/run:/var/adm:/etc "/var/run/utx.active"
 PATH_UTMPX     <utmpx.h> <utmpx.h>:UTMPX_FILE $(localstatedir)/run/utmpx 
search:utmpx:/var/run:/var/adm:/etc "/var/run/utx.active"
-PATH_WTMP      <utmp.h> <utmp.h>:WTMP_FILE $(localstatedir)/log/wtmp 
search:wtmp:/var/log:/var/adm:/etc
+PATH_WTMP      <utmp.h> <utmp.h>:WTMP_FILE $(localstatedir)/log/wtmp 
search:wtmp:/var/log:/var/adm:/etc "/var/log/utx.log"
 PATH_WTMPX     <utmpx.h> <utmpx.h>:WTMPX_FILE $(localstatedir)/log/wtmpx 
search:wtmpx:/var/log:/var/adm:/etc "/var/log/utx.log"
 PATH_LASTLOG   <utmp.h> $(localstatedir)/log/lastlog 
search:lastlog:/var/log:/var/adm:/etc "/var/log/utx.lastlogin"
 PATH_LOG       <syslog.h> /dev/log
diff --git a/src/Makefile.am b/src/Makefile.am
index c108668..718c75e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,7 @@ EXTRA_PROGRAMS += uucpd
 
 INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libicmp
 
-AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) 
$(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) 
$(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF) 
$(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) 
$(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
+AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) 
$(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) 
$(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF) 
$(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) 
$(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UTMPX) $(PATHDEF_UUCICO)
 
 SUIDMODE = -o root -m 4775
 
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 33372ec..320f52c 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -35,6 +35,6 @@ talkd_SOURCES = \
 
 @PATHDEFS_MAKE@
 
-AM_CPPFLAGS = $(PATHDEF_DEV)
+AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_UTMP) $(PATHDEF_UTMPX)
 INCLUDES = $(iu_INCLUDES)
 LDADD = $(iu_LIBRARIES)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   10 ++++++++++
 paths             |    4 ++--
 src/Makefile.am   |    2 +-
 talkd/Makefile.am |    2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils