aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extension/ChangeLog5
-rw-r--r--extension/Makefile.am2
-rw-r--r--extension/Makefile.in16
-rw-r--r--test/ChangeLog8
-rw-r--r--test/Makefile.am11
-rw-r--r--test/Makefile.in11
6 files changed, 34 insertions, 19 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 74ad26a4..466ebd6e 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-28 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * Makefile.am: Rename man_MANS to dist_man_MANS to include the man
+ pages in the distribution tarball.
+
2012-08-26 Arnold D. Robbins <arnold@skeeve.com>
* configure.ac (AC_SYS_LARGEFILE): Added. Needed for consistency
diff --git a/extension/Makefile.am b/extension/Makefile.am
index f7d939a4..1bd0bdab 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -96,7 +96,7 @@ EXTRA_DIST = build-aux/config.rpath \
ChangeLog \
ChangeLog.0
-man_MANS = \
+dist_man_MANS = \
filefuncs.3am fnmatch.3am fork.3am ordchr.3am \
readdir.3am readfile.3am rwarray.3am time.3am
diff --git a/extension/Makefile.in b/extension/Makefile.in
index bebc006b..a217b58f 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -74,9 +74,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/configh.in \
- $(top_srcdir)/build-aux/ar-lib \
+DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/configh.in $(top_srcdir)/build-aux/ar-lib \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.rpath \
$(top_srcdir)/build-aux/config.sub \
@@ -240,7 +240,7 @@ am__can_run_installinfo = \
esac
man3dir = $(mandir)/man3
NROFF = nroff
-MANS = $(man_MANS)
+MANS = $(dist_man_MANS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -483,7 +483,7 @@ EXTRA_DIST = build-aux/config.rpath \
ChangeLog \
ChangeLog.0
-man_MANS = \
+dist_man_MANS = \
filefuncs.3am fnmatch.3am fork.3am ordchr.3am \
readdir.3am readfile.3am rwarray.3am time.3am
@@ -649,10 +649,10 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
-install-man3: $(man_MANS)
+install-man3: $(dist_man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
- list2='$(man_MANS)'; \
+ list2='$(dist_man_MANS)'; \
test -n "$(man3dir)" \
&& test -n "`echo $$list1$$list2`" \
|| exit 0; \
@@ -687,7 +687,7 @@ uninstall-man3:
@$(NORMAL_UNINSTALL)
@list=''; test -n "$(man3dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
sed -n '/\.3[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
diff --git a/test/ChangeLog b/test/ChangeLog
index 680954ed..6b02c6a1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-28 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * Makefile.am (EXTRA_DIST): Add jarebug.sh.
+ (readdir): Use standard output filenames readdir.ok and _readdir
+ instead of readdir.out1 and readdir.out2. The standard names are
+ required for the pass-fail and diffout rules to work correctly.
+ (clean): Remove readdir.ok
+
2012-08-26 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (charasbytes): Revise test to canonicalize
diff --git a/test/Makefile.am b/test/Makefile.am
index 5f62852d..60b50a87 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -408,6 +408,7 @@ EXTRA_DIST = \
jarebug.awk \
jarebug.in \
jarebug.ok \
+ jarebug.sh \
lc_num1.awk \
lc_num1.ok \
leaddig.awk \
@@ -1647,10 +1648,10 @@ assignconst:
readdir:
@echo $@
- @touch $@.out1 $@.out2 # create directory entries first
- @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.out1
- @$(AWK) -f $(srcdir)/readdir.awk . > $@.out2
- @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12]
+ @touch $@.ok _$@ # create directory entries first
+ @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.ok
+ @$(AWK) -f $(srcdir)/readdir.awk . > _$@
+ @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
@echo $@
@@ -1672,7 +1673,7 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
clean:
- rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2
+ rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok
# An attempt to print something that can be grepped for in build logs
pass-fail:
diff --git a/test/Makefile.in b/test/Makefile.in
index 35c7b201..4cda1d44 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -620,6 +620,7 @@ EXTRA_DIST = \
jarebug.awk \
jarebug.in \
jarebug.ok \
+ jarebug.sh \
lc_num1.awk \
lc_num1.ok \
leaddig.awk \
@@ -2029,10 +2030,10 @@ assignconst:
readdir:
@echo $@
- @touch $@.out1 $@.out2 # create directory entries first
- @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.out1
- @$(AWK) -f $(srcdir)/readdir.awk . > $@.out2
- @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12]
+ @touch $@.ok _$@ # create directory entries first
+ @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.ok
+ @$(AWK) -f $(srcdir)/readdir.awk . > _$@
+ @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
@echo $@
@@ -3315,7 +3316,7 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
clean:
- rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2
+ rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok
# An attempt to print something that can be grepped for in build logs
pass-fail:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:01:53 +0000