distcheck fixes

bk: 449ef97fF9ktrqOZqGGg5Lbgp-cqIQ

diff --git a/Makefile.am b/Makefile.am
index 9c88d7a51f911dcf579cb71f4844c0b5928f60b5..cf4fa3a1a553b85efc67eef9e329dea8fab4082d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ EXTRA_DIST = \
        libisc \
        ports \
        \
+       bincheck.mf \
        version \
        version.m4
 

diff --git a/bootstrap b/bootstrap
index 533058231ce69ffe4a6558a6ae4f0ef02fbcf943..7eecf49c088f6dad3be2771a4c510578af5bc5d0 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -33,6 +33,8 @@ AUTORECONF=${AUTORECONF:-autoreconf}
 
 scripts/genver
 
+cp bincheck.mf sntp/
+
 #rm -rf sntp/libopts*
 #gunzip -c $(autoopts-config --libsrc) | (
 #  cd sntp

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 31304be42406004277e673db0db32ddc2e127e79..517fa4b276a115701f9b7ef95cf6ad15be33cb75 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -1,33 +1,15 @@
+# Makefile.am, by Harlan Stenn, from:
 # Makefile for sntp
 # N.M. Maclaren, October 2000.
 
-# Take a look at README for the various preprocessor symbols, but they are
-# extremely unlikely to be needed on newer systems.  You may prefer to change
-# LOCKNAME and SAVENAME to use /var/run (or even /tmp) rather than /etc.  Note
-# that not all of the following system settings have been tested recently.
-
 AUTOMAKE_OPTIONS = foreign
 
-# Compiling this sort of ANSI C under SunOS 4.1 is a mug's game, because Sun's
-# Unix headers make GNU C vomit even in compatibility mode, but the following
-# will compile main.c and unix.c.  At least two people have got it to work.
-# CC = gcc -ansi
-# CFLAGS = -O -DNONBLOCK_BROKEN
-# LDFLAGS =
-# LIBS = -lm
-
-# The following settings can be used under Linux.  While adjtime is present,
-# it is completely broken (i.e. it will work only if xntp is running), so it
-# is a good idea to add -DADJTIME_MISSING.
-# CC = cc -DADJTIME_MISSING
-# CFLAGS = -O
-# LDFLAGS = 
-# LIBS = -lm
-
 NULL=
 
+EXTRA_DIST=    bincheck.mf
+
 bindir=        ${exec_prefix}/${BINSUBDIR}
-bin_PROGRAMS = sntp
+bin_PROGRAMS=  sntp
 
 sntp_SOURCES = \
        header.h \
@@ -42,4 +24,4 @@ sntp_SOURCES = \
 
 dist_man_MANS= sntp.1
 
-include ../bincheck.mf
+include bincheck.mf