From: Dave Hart <hart@ntp.org>
Date: Thu, 4 Feb 2010 03:01:42 +0000 (+0000)
Subject: Makefile.am:
X-Git-Tag: NTP_4_2_6P1_RC4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69383e4de2f5b4597591afaba455824fd5e7232f;p=thirdparty%2Fntp.git

Makefile.am:
  fix make distdir before make all on FreeBSD make

bk: 4b6a38969f9vXwV3VstM9WqAI2xcNA
---

diff --git a/Makefile.am b/Makefile.am
index 0af244927..8bea08e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ DIST_SUBDIRS=		\
 DISTCHECK_CONFIGURE_FLAGS = -C
 
 EXTRA_DIST =			\
-	COPYRIGHT		\
+	$(srcdir)/COPYRIGHT	\
 	ChangeLog		\
 	CommitLog		\
 	CommitLog-4.1.0		\
@@ -85,7 +85,7 @@ EXTRA_DIST =			\
 	bincheck.mf		\
 	depsver.mf		\
 	deps-ver		\
-	version			\
+	$(srcdir)/version	\
 	version.m4		\
 	\
 	$(NULL)
@@ -102,9 +102,9 @@ ETAGS_ARGS = Makefile.am configure.ac
 BUILT_SOURCES =				\
 	.gcc-warning			\
 	libtool				\
-	$(srcdir)/COPYRIGHT		\
-	$(srcdir)/version		\
-	$(srcdir)/version.m4		\
+	COPYRIGHT			\
+	version				\
+	version.m4			\
 	$(srcdir)/include/version.def	\
 	$(srcdir)/include/version.texi	\
 	$(NULL)
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 10bbb20eb..b5a12ec1c 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -48,34 +48,35 @@ sntp_SOURCES =		\
 	$(NULL)
 
 EXTRA_DIST=				\
-		autogen-version.def	\
-		bincheck.mf		\
-		COPYRIGHT		\
-		deps-ver		\
-		depsver.mf		\
-		sntp-opts.def		\
-		sntp-opts.menu		\
-		sntp-opts.texi		\
-		sntp.1			\
-		sntp.html		\
-		sntp.texi		\
-		version.def		\
-		version.m4		\
-		version.texi		\
-		$(NULL)
+	$(srcdir)/autogen-version.def	\
+	bincheck.mf			\
+	$(srcdir)/COPYRIGHT		\
+	deps-ver			\
+	depsver.mf			\
+	sntp-opts.def			\
+	sntp-opts.menu			\
+	sntp-opts.texi			\
+	sntp.1				\
+	sntp.html			\
+	sntp.texi			\
+	$(srcdir)/version.def		\
+	$(srcdir)/version.m4		\
+	$(srcdir)/version.texi		\
+	$(NULL)
 
 OLD_EXTRA_DIST=		\
 		autogen-version.def version.def version.m4 version.texi
 
-BUILT_SOURCES=						\
-		check-autogen-version.def		\
-		check-version.def check-version.m4	\
-		check-version.texi			\
-		$(srcdir)/COPYRIGHT			\
-		libtool					\
-		sntp-opts.c				\
-		sntp-opts.h				\
-		$(NULL)
+BUILT_SOURCES=				\
+	check-autogen-version.def	\
+	check-version.def		\
+	check-version.m4		\
+	check-version.texi		\
+	COPYRIGHT			\
+	libtool				\
+	sntp-opts.c			\
+	sntp-opts.h			\
+	$(NULL)
 
 man_MANS=	$(srcdir)/sntp.1
 
@@ -145,7 +146,7 @@ $(srcdir)/../COPYRIGHT:
 
 check-COPYRIGHT-submake: $(srcdir)/../COPYRIGHT
 	@cmp -s $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
-	 || { cp $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
+	 || { cp $(srcdir)/../COPYRIGHT $(srcdir)		\
 	      && echo 'updated sntp/COPYRIGHT installed' ;}
 	@echo 'submake avoided if this file is newer than parent COPYRIGHT' > $@