From: Dave Hart <hart@ntp.org>
Date: Wed, 30 Dec 2009 05:48:36 +0000 (+0000)
Subject: With EXTRA_DIST fix from [Bug 1446] read-only $(srcdir) hacks in
X-Git-Tag: NTP_4_2_6P1_RC3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b0bebc8ae3fe5811a39a4c45764b394d6705403;p=thirdparty%2Fntp.git

With EXTRA_DIST fix from [Bug 1446] read-only $(srcdir) hacks in
  *.1, *.texi, and *.html Makefile rules are not needed.

bk: 4b3ae9b42y2cpp4_vFgA4kuPLtdQSw
---

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index a22fcf3dd..b0bc10c24 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -122,11 +122,6 @@ EXTRA_PROGRAMS = check_y2k ntpdsim keyword-gen
 noinst_DATA =	$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(top_srcdir) $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir)	\
-		$(top_srcdir) ;}
 std_def_list=	$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/copyright.def 		\
 		$(top_srcdir)/include/version.def
@@ -234,15 +229,13 @@ $(srcdir)/ntpd-opts.c: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std
 	$(run_ag) ntpd-opts.def
 
 $(srcdir)/ntpd.1: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
 
 $(srcdir)/ntpd-opts.menu: $(srcdir)/ntpd-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/ntpd-opts.texi: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
 
 $(PROGRAMS): $(LDADD)
 
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index dbb19048a..c87c6b74e 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -28,11 +28,6 @@ man_MANS=	$(srcdir)/ntpdc.1
 noinst_DATA=	$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(top_srcdir) $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir)	\
-		$(top_srcdir) ;}
 std_def_list=	$(top_srcdir)/include/debug-opt.def		\
 		$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/copyright.def 		\
@@ -46,15 +41,13 @@ $(srcdir)/ntpdc-opts.c: $(srcdir)/ntpdc-opts.def $(std_def_list)
 	$(run_ag) ntpdc-opts.def
 
 $(srcdir)/ntpdc.1: $(srcdir)/ntpdc-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
 
 $(srcdir)/ntpdc-opts.menu: $(srcdir)/ntpdc-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/ntpdc-opts.texi: $(srcdir)/ntpdc-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c ntpdc-opts.c ntpdc-opts.h
 
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 8807b3498..268e50e23 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -26,11 +26,6 @@ man_MANS=	$(srcdir)/ntpq.1
 noinst_DATA=	$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(top_srcdir) $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir)	\
-		$(top_srcdir) ;}
 std_def_list=	$(top_srcdir)/include/debug-opt.def		\
 		$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/copyright.def 		\
@@ -47,15 +42,13 @@ $(srcdir)/ntpq-opts.c: $(srcdir)/ntpq-opts.def $(std_def_list)
 	$(run_ag) ntpq-opts.def
 
 $(srcdir)/ntpq.1: $(srcdir)/ntpq-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
 
 $(srcdir)/ntpq-opts.menu: $(srcdir)/ntpq-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/ntpq-opts.texi: $(srcdir)/ntpq-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
 
 $(PROGRAMS): $(LDADD)
 
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index dc1f88608..c04b41532 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -29,11 +29,6 @@ noinst_DATA=	$(srcdir)/ntpsnmpd-opts.texi $(srcdir)/ntpsnmpd-opts.menu
 man_MANS=	$(srcdir)/ntpsnmpd.1
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(top_srcdir) $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir)	\
-		$(top_srcdir) ;}
 std_def_list=	$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/copyright.def 		\
 		$(top_srcdir)/include/homerc.def 		\
@@ -46,15 +41,13 @@ $(srcdir)/ntpsnmpd-opts.c: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
 	$(run_ag) ntpsnmpd-opts.def
 
 $(srcdir)/ntpsnmpd.1: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Tagman1.tpl -bntpsnmpd ntpsnmpd-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bntpsnmpd ntpsnmpd-opts.def
 
 $(srcdir)/ntpsnmpd-opts.menu: $(srcdir)/ntpsnmpd-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/ntpsnmpd-opts.texi: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section ntpsnmpd-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpsnmpd-opts.def
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index b0c75d500..c2527cd00 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -14,10 +14,6 @@ LDADD=	$(LIBOPTS_LDADD) -lm ../libntp/libntp.a
 
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir) ;}
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=	sntp
@@ -138,21 +134,16 @@ $(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
 	$(run_ag) sntp-opts.def
 
 $(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
-	$(run_ro) $(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
 
 $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
 
 $(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi
-	$(run_ro) cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html+ sntp.texi
-	$(if_ro_src) { chmod a-w $(srcdir)/sntp.html+ && chmod u+w $(srcdir)/sntp.html ;}
-	$(post_run_ro)
-	mv $(srcdir)/sntp.html+ $(srcdir)/sntp.html
+	cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE)
diff --git a/util/Makefile.am b/util/Makefile.am
index 956c9c946..3be9cd4ec 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -31,11 +31,6 @@ noinst_DATA=	$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu
 man_MANS=	$(srcdir)/ntp-keygen.1
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../include --writable
-run_ro=		( { test -w $(srcdir) && exit 0 ;} || { touch ro_srcdir	\
-		&& chmod u+w $(top_srcdir) $(srcdir) ;} ) &&
-if_ro_src=	{ test ! -f ro_srcdir && exit 0 ;} ||
-post_run_ro=	$(if_ro_src) { rm ro_srcdir && chmod u-w $(srcdir)	\
-		$(top_srcdir) ;}
 std_def_list=	$(top_srcdir)/include/debug-opt.def		\
 		$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/copyright.def 		\
@@ -49,15 +44,13 @@ $(srcdir)/ntp-keygen-opts.c: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
 	$(run_ag) ntp-keygen-opts.def
 
 $(srcdir)/ntp-keygen.1: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Tagman1.tpl -bntp-keygen ntp-keygen-opts.def
-	$(post_run_ro)
+	$(run_ag) -Tagman1.tpl -bntp-keygen ntp-keygen-opts.def
 
 $(srcdir)/ntp-keygen-opts.menu: $(srcdir)/ntp-keygen-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
 $(srcdir)/ntp-keygen-opts.texi: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
-	$(run_ro) $(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def
-	$(post_run_ro)
+	$(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def
 
 
 jitter_SOURCES=	jitter.c jitter.h