[Bug bootstrap/14905] 'make install' fails on grepjar.1, not included in tarball

[kcook at gcc dot gnu dot org]

------- Additional Comments From kcook at gcc dot gnu dot org  2004-04-12 10:51 -------
Subject: Re:  'make install' fails on grepjar.1, not included in tarball

The root problem is that POD2MAN is in perl and I never tested the read
only source directory changes on a system without Perl :(

This small hack should fix it by following Mark's suggestion and
recognizing --enable-generated-files-in-srcdir.  Could the bug reporter
try it out, disabling Perl on this system is not an simple task.

Please note that I have only tested this on a 3.5 tree.  Specifically,
I have not yet tried this out with autoconf 2.57 which GCC 3.4 uses,
though I do not expect any difficulties.  I'll do so later today.2004-04-12  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.ac: Recognize --enable-generated-files-in-srcdir.
	* Makefile.am: New rule to copy man files to source directory.
	* configure, Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.14
diff -u -p -d -r1.14 Makefile.am
--- Makefile.am	1 Dec 2003 02:58:26 -0000	1.14
+++ Makefile.am	12 Apr 2004 10:34:46 -0000
@@ -67,6 +67,10 @@ fastjar_TEXINFOS = \
 man_MANS = jar.1 grepjar.1
 EXTRA_DIST = $(man_MANS)
 
+if GENINSRC
+man_MANS += stamp-maninsrc
+endif
+
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
 POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
 
@@ -74,6 +78,10 @@ POD2MAN = pod2man --center="GNU" --relea
 	-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
 		mv -f $(@).T$$$$ $@) || \
 		(rm -f $(@).T$$$$ && exit 1)
+
+stamp-maninsrc: jar.1 grepjar.1
+	-cp -p $(top_builddir)/jar.1 $(srcdir)/jar.1
+	-cp -p $(top_builddir)/grepjar.1 $(srcdir)/grepjar.1
 
 .INTERMEDIATE: jar.pod grepjar.pod
 
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/configure.ac,v
retrieving revision 1.2
diff -u -p -d -r1.2 configure.ac
--- configure.ac	11 Mar 2004 00:27:17 -0000	1.2
+++ configure.ac	12 Apr 2004 10:34:48 -0000
@@ -67,6 +67,27 @@ AC_SUBST(ZLIBS)
 AC_SUBST(ZDEPS)
 AC_SUBST(ZINCS)
 
+# GCC LOCAL CHANGE
+# We would like to our source tree to be readonly.  However when releases or
+# pre-releases are generated, the man pages need to be included as they are
+# converted from the texi files via perl which we don't require end users to
+# have installed.
+# Therefore we have --enable-generated-files-in-srcdir to do 
+# just that.
+
+AC_MSG_CHECKING([whether to place generated files in the source directory])
+  dnl generated-files-in-srcdir is disabled by default
+  AC_ARG_ENABLE(generated-files-in-srcdir, 
+[  --enable-generated-files-in-srcdir
+                          put copies of generated files in source dir
+                          intended for creating source tarballs for users
+                          without texinfo bison or flex.],
+      generated_files_in_srcdir=$enableval,
+      generated_files_in_srcdir=no)
+
+AC_MSG_RESULT($generated_files_in_srcdir)
+AM_CONDITIONAL(GENINSRC, test x$generated_files_in_srcdir = xyes)
+
 # Get the version trigger filename from the toplevel
 if test "${with_gcc_version_trigger+set}" = set; then
    gcc_version_trigger=$with_gcc_version_trigger


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14905