gprofng: build documentation only if BUILD_MAN is true

gprofng/ChangeLog
2022-09-16  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

	PR gprofng/29476
	* gprofng/Makefile.am: Build documentation only if BUILD_MAN is true
	* gprofng/Makefile.in: Rebuild.
	* gprofng/configure: Rebuild.

diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am
index 2fcd695140ca6e3f06f3cc6844d498847a21a63d..96f8015700885e00b9e121cd61adede63c2b832e 100644 (file)
--- a/gprofng/Makefile.am
+++ b/gprofng/Makefile.am
@@ -23,11 +23,14 @@ AUTOMAKE_OPTIONS = dejagnu foreign
 if BUILD_COLLECTOR
     COLLECTOR_SUBDIRS = libcollector
 endif
+if BUILD_MAN
+    DOC_SUBDIR = doc
+endif
 if BUILD_SRC
-    SRC_SUBDIRS = src gp-display-html doc
+    SRC_SUBDIRS = src gp-display-html $(DOC_SUBDIR)
 endif
 SUBDIRS = $(COLLECTOR_SUBDIRS) $(SRC_SUBDIRS)
-DIST_SUBDIRS = libcollector src gp-display-html doc
+DIST_SUBDIRS = libcollector src gp-display-html $(DOC_SUBDIR)
 
 # Setup the testing framework, if you have one
 EXPECT = expect

diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
index fd5279b4df13ca21061bfc833797a0bb6ada62bc..d660f99233fedef9df9cae31629cd3ba57a51150 100644 (file)
--- a/gprofng/Makefile.in
+++ b/gprofng/Makefile.in
@@ -381,9 +381,10 @@ zlibinc = @zlibinc@
 ACLOCAL_AMFLAGS = -I . -I .. 
 AUTOMAKE_OPTIONS = dejagnu foreign
 @BUILD_COLLECTOR_TRUE@COLLECTOR_SUBDIRS = libcollector
-@BUILD_SRC_TRUE@SRC_SUBDIRS = src gp-display-html doc
+@BUILD_MAN_TRUE@DOC_SUBDIR = doc
+@BUILD_SRC_TRUE@SRC_SUBDIRS = src gp-display-html $(DOC_SUBDIR)
 SUBDIRS = $(COLLECTOR_SUBDIRS) $(SRC_SUBDIRS)
-DIST_SUBDIRS = libcollector src gp-display-html doc
+DIST_SUBDIRS = libcollector src gp-display-html $(DOC_SUBDIR)
 RUNTEST = runtest
 RUNTESTFLAGS = 
 BASEDIR = $(srcdir)/..

diff --git a/gprofng/configure b/gprofng/configure
index 301ac10050b7a3613427484196182952005ae91f..c90e36cb1cf41a8eb880453fdc755dedd8989ba9 100755 (executable)
--- a/gprofng/configure
+++ b/gprofng/configure
@@ -16628,7 +16628,6 @@ LIBC=gnu
 EOF
 cc_set_libc=`$CC -E "dummy.c" 2>/dev/null | grep '^LIBC=' | sed 's, ,,g'`
 eval "$cc_set_libc"
-echo "cc_set_libc=$cc_set_libc;"
 if test "$LIBC" = musl; then
 
 $as_echo "#define __MUSL_LIBC 1" >>confdefs.h