From 1a6e3fbfee2baf782bc531f835f7b2eeebfeef49 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 29 Feb 2012 16:37:18 -0800
Subject: [PATCH] Fix build so "make dist" works
---
doc/man/man1/Makefile.am | 7 ++-----
doc/man/man1/Makefile.in | 20 +++++++-------------
doc/man/man3/Makefile.am | 3 +--
doc/man/man3/Makefile.in | 2 +-
doc/man/man5/Makefile.am | 9 +++------
doc/man/man5/Makefile.in | 20 +++++++-------------
doc/man/man8/Makefile.am | 9 +++------
doc/man/man8/Makefile.in | 20 +++++++-------------
8 files changed, 31 insertions(+), 59 deletions(-)
diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
index 20d462b5020..8216b35aea8 100644
--- a/doc/man/man1/Makefile.am
+++ b/doc/man/man1/Makefile.am
@@ -1,7 +1,5 @@
htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
-EXTRA_DIST = man1
-
man1_MANS = \
sacct.1 \
sacctmgr.1 \
@@ -25,6 +23,8 @@ man1_MANS = \
strigger.1 \
sview.1
+EXTRA_DIST = $(man1_MANS)
+
if HAVE_MAN2HTML
html_DATA = \
@@ -59,6 +59,3 @@ SUFFIXES = .html
`dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
endif
-
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in
index 71b2f693ef9..a3ab2717a22 100644
--- a/doc/man/man1/Makefile.in
+++ b/doc/man/man1/Makefile.in
@@ -313,7 +313,6 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = man1 $(am__append_1)
man1_MANS = \
sacct.1 \
sacctmgr.1 \
@@ -337,6 +336,7 @@ man1_MANS = \
strigger.1 \
sview.1
+EXTRA_DIST = $(man1_MANS) $(am__append_1)
@HAVE_MAN2HTML_TRUE@html_DATA = \
@HAVE_MAN2HTML_TRUE@ sacct.html \
@HAVE_MAN2HTML_TRUE@ sacctmgr.html \
@@ -505,9 +505,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(MANS) $(DATA)
@@ -612,12 +609,12 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- dist-hook distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-htmlDATA install-info install-info-am \
- install-man install-man1 install-pdf install-pdf-am install-ps \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-htmlDATA install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
@@ -628,9 +625,6 @@ uninstall-man: uninstall-man1
@HAVE_MAN2HTML_TRUE@.1.html:
@HAVE_MAN2HTML_TRUE@ `dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/doc/man/man3/Makefile.am b/doc/man/man3/Makefile.am
index 5e82998f46a..a2ec99a8082 100644
--- a/doc/man/man3/Makefile.am
+++ b/doc/man/man3/Makefile.am
@@ -1,5 +1,3 @@
-EXTRA_DIST = man3
-
man3_MANS = slurm_hostlist_create.3 \
slurm_hostlist_destroy.3 \
slurm_hostlist_shift.3 \
@@ -132,3 +130,4 @@ man3_MANS = slurm_hostlist_create.3 \
slurm_update_reservation.3 \
slurm_update_step.3
+EXTRA_DIST = $(man3_MANS)
diff --git a/doc/man/man3/Makefile.in b/doc/man/man3/Makefile.in
index 0b61f2fed47..4baaee0c493 100644
--- a/doc/man/man3/Makefile.in
+++ b/doc/man/man3/Makefile.in
@@ -310,7 +310,6 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = man3
man3_MANS = slurm_hostlist_create.3 \
slurm_hostlist_destroy.3 \
slurm_hostlist_shift.3 \
@@ -443,6 +442,7 @@ man3_MANS = slurm_hostlist_create.3 \
slurm_update_reservation.3 \
slurm_update_step.3
+EXTRA_DIST = $(man3_MANS)
all: all-am
.SUFFIXES:
diff --git a/doc/man/man5/Makefile.am b/doc/man/man5/Makefile.am
index f8a9ca37a7c..4ae881ecdc4 100644
--- a/doc/man/man5/Makefile.am
+++ b/doc/man/man5/Makefile.am
@@ -1,7 +1,5 @@
htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
-EXTRA_DIST = man5
-
man5_MANS = bluegene.conf.5 \
cgroup.conf.5 \
cray.conf.5 \
@@ -11,7 +9,10 @@ man5_MANS = bluegene.conf.5 \
topology.conf.5 \
wiki.conf.5
+EXTRA_DIST = $(man5_MANS)
+
if HAVE_MAN2HTML
+
html_DATA = \
bluegene.conf.html \
cgroup.conf.html \
@@ -31,7 +32,3 @@ SUFFIXES = .html
`dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
endif
-
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
-
diff --git a/doc/man/man5/Makefile.in b/doc/man/man5/Makefile.in
index 04779e7410c..b8e0052f2a1 100644
--- a/doc/man/man5/Makefile.in
+++ b/doc/man/man5/Makefile.in
@@ -313,7 +313,6 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = man5 $(am__append_1)
man5_MANS = bluegene.conf.5 \
cgroup.conf.5 \
cray.conf.5 \
@@ -323,6 +322,7 @@ man5_MANS = bluegene.conf.5 \
topology.conf.5 \
wiki.conf.5
+EXTRA_DIST = $(man5_MANS) $(am__append_1)
@HAVE_MAN2HTML_TRUE@html_DATA = \
@HAVE_MAN2HTML_TRUE@ bluegene.conf.html \
@HAVE_MAN2HTML_TRUE@ cgroup.conf.html \
@@ -478,9 +478,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(MANS) $(DATA)
@@ -585,12 +582,12 @@ uninstall-man: uninstall-man5
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- dist-hook distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-htmlDATA install-info install-info-am \
- install-man install-man5 install-pdf install-pdf-am install-ps \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-htmlDATA install-info install-info-am install-man \
+ install-man5 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
@@ -601,9 +598,6 @@ uninstall-man: uninstall-man5
@HAVE_MAN2HTML_TRUE@.5.html:
@HAVE_MAN2HTML_TRUE@ `dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/doc/man/man8/Makefile.am b/doc/man/man8/Makefile.am
index 9724ea74de1..7334555a222 100644
--- a/doc/man/man8/Makefile.am
+++ b/doc/man/man8/Makefile.am
@@ -1,14 +1,15 @@
htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
-EXTRA_DIST = man8
-
man8_MANS = slurmctld.8 \
slurmd.8 \
slurmdbd.8 \
slurmstepd.8 \
spank.8
+EXTRA_DIST = $(man8_MANS)
+
if HAVE_MAN2HTML
+
html_DATA = \
slurmctld.html \
slurmd.html \
@@ -26,7 +27,3 @@ SUFFIXES = .html
`dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
endif
-
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
-
diff --git a/doc/man/man8/Makefile.in b/doc/man/man8/Makefile.in
index 654a80a0ef6..2c46deb5e8d 100644
--- a/doc/man/man8/Makefile.in
+++ b/doc/man/man8/Makefile.in
@@ -313,13 +313,13 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = man8 $(am__append_1)
man8_MANS = slurmctld.8 \
slurmd.8 \
slurmdbd.8 \
slurmstepd.8 \
spank.8
+EXTRA_DIST = $(man8_MANS) $(am__append_1)
@HAVE_MAN2HTML_TRUE@html_DATA = \
@HAVE_MAN2HTML_TRUE@ slurmctld.html \
@HAVE_MAN2HTML_TRUE@ slurmd.html \
@@ -473,9 +473,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(MANS) $(DATA)
@@ -580,12 +577,12 @@ uninstall-man: uninstall-man8
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- dist-hook distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-htmlDATA install-info install-info-am \
- install-man install-man8 install-pdf install-pdf-am install-ps \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-htmlDATA install-info install-info-am install-man \
+ install-man8 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
@@ -596,9 +593,6 @@ uninstall-man: uninstall-man8
@HAVE_MAN2HTML_TRUE@.8.html:
@HAVE_MAN2HTML_TRUE@ `dirname $<`/../man2html.py $(srcdir)/../../html/header.txt $(srcdir)/../../html/footer.txt $<
-dist-hook:
- -rm -rf `find $(distdir) -name CVS`
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
GitLab