This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
[Bug bootstrap/14905] 'make install' fails on grepjar.1, not included in tarball
- From: "kcook34 at ford dot com" <gcc-bugzilla at gcc dot gnu dot org>
- To: gcc-bugs at gcc dot gnu dot org
- Date: 12 Apr 2004 15:13:27 -0000
- Subject: [Bug bootstrap/14905] 'make install' fails on grepjar.1, not included in tarball
- References: <20040410025940.14905.mec.gnu@mindspring.com>
- Reply-to: gcc-bugzilla at gcc dot gnu dot org
------- Additional Comments From kcook34 at ford dot com 2004-04-12 15:13 -------
Subject: Re: 'make install' fails on grepjar.1, not
included in tarball [v2]
Take two.
Testing showed that the fastjar.info file also wasn't being put in the
tarball.
I also didn't like the way that I lied to automake in the first
iteration; so I dove into the automake documentation and discovered its
highly useful "all-local:" target. I think this patch is better.
Now also tested under GCC 3.4 with and without
--enable-generated-files-in-srcdir.
OK to install?
2004-04-12 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac: Parse --enable-generated-files-in-srcdir.
* Makefile.am: Copy man and info files to srcdir if requested.
* configure: Regenerate.
* Makefile.in Regenerate.
diff -prud /home/kcook34/gcc-3.4-20040407/fastjar/Makefile.am ./Makefile.am
--- /home/kcook34/gcc-3.4-20040407/fastjar/Makefile.am 2003-11-30 21:58:26.000000000 -0500
+++ ./Makefile.am 2004-04-12 10:52:36.954084800 -0400
@@ -82,3 +82,26 @@ jar.pod: $(srcdir)/fastjar.texi
grepjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D grepjar $< > $@
+
+# The following commands allow us to release tarballs with the man pages
+# and info documentation prebuilt. This feature is enabled via
+# --enable-generated-files-in-srcdir in the configure script.
+
+if GENINSRC
+STAMP_GENINSRC = stamp-geninsrc
+else
+STAMP_GENINSRC =
+endif
+
+all-local: $(STAMP_GENINSRC)
+
+stamp-geninsrc: jar.1 grepjar.1 fastjar.info
+ -cp -p $(top_builddir)/jar.1 $(srcdir)/jar.1
+ -cp -p $(top_builddir)/grepjar.1 $(srcdir)/grepjar.1
+ -cp -p $(top_builddir)/fastjar.info $(srcdir)/fastjar.info
+ touch $@
+
+CLEANFILES = stamp-geninsrc
+MAINTAINERCLEANFILES = $(srcdir)/jar.1 \
+ $(srcdir)/grepjar.1 \
+ $(srcdir)/fastjar.info
diff -prud /home/kcook34/gcc-3.4-20040407/fastjar/configure.ac ./configure.ac
--- /home/kcook34/gcc-3.4-20040407/fastjar/configure.ac 2004-01-09 21:09:08.000000000 -0500
+++ ./configure.ac 2004-04-12 10:42:02.652003200 -0400
@@ -67,6 +67,26 @@ 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, perl, 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