This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Update to fastjar directory to allow for readonly source directory.
- From: Kelley Cook <kcook34 at ford dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>, java-patches at gcc dot gnu dot org, Bryan Burns <toast at users dot sourceforge dot net>
- Date: Wed, 29 Oct 2003 12:54:36 -0500
- Subject: Update to fastjar directory to allow for readonly source directory.
- Hop-count: 1
- Reply-to: Kelley Cook <kelleycook at wideopenwest dot com>
This is the final piece for GCC's PR/10996.
fastjar is currently placing fastjar.info, jar.1 and grepjar.1 into its
source directory.
This small patch fixes that by updating the build rules of those files
to match GCC's rules and place them into the build directory.
Tested with "make all", "make jar.1", "make grepjar.1", "make
fastjar.info", and "make install" in the fastjar directory on
i686-pc-cygwin which all worked as expected.
I am also submitting this to the upstream maintainer, but there does not
seem to be much activity there.
OK?
Kelley Cook
2003-10-30 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am (my_make_i_flags): Add $(srcdir) and update comment
to match.
(fastjar.info): Update target to write to build directory.
(%.1): New implicit rule from a .pod file.
(jar.1): Delete.
(grepjar.1): Delete.
(jar.pod): New intermediate rule.
(grepjar.pod): Likewise.
* Makefile.in: Regenerate with automake 1.4p6.
--- Makefile.am.orig 2003-10-29 12:05:08.726228500 -0500
+++ Makefile.am 2003-10-29 12:37:40.872742500 -0500
@@ -70,28 +70,24 @@
## available in 1.4. Nor can we override or append to MAKEINFO or
## MAKEINFOFLAGS, since these are overridden by the top-level
## Makefile. So, we just duplicate the rules. FIXME: remove this
-## when we upgrade automake. Note that we don't include $(srcdir) in
-## my_makei_flags; makeinfo is run in srcdir.
-my_makei_flags += -I ../gcc/doc/include
+## when we upgrade automake.
+my_makei_flags += -I $(srcdir)/../gcc/doc/include
fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
- && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'`
-
+ rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ $(MAKEINFO) $(my_makei_flags) -o $@ $<
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
-$(srcdir)/jar.1: $(srcdir)/fastjar.texi
- -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod
- -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \
- mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \
- (rm -f jar.1.T$$$$ && exit 1)
- -rm -f fastjar.pod
+%.1: %.pod
+ -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
+ mv -f $(@).T$$$$ $@) || \
+ (rm -f $(@).T$$$$ && exit 1)
-$(srcdir)/grepjar.1: $(srcdir)/fastjar.texi
- -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod
- -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \
- mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \
- (rm -f grepjar.1.T$$$$ && exit 1)
- -rm -f grepjar.pod
+.INTERMEDIATE: jar.pod grepjar.pod
+
+jar.pod: $(srcdir)/fastjar.texi
+ -$(TEXI2POD) -D jar $< > $@
+
+grepjar.pod: $(srcdir)/fastjar.texi
+ -$(TEXI2POD) -D grepjar $< > $@