This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[3.4 patch] installation of manual pages under the same (maybe transformed) name
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Cc: Geoff Keating <geoffk at desire dot geoffk dot org>, Mark Mitchell <mark at codesourcery dot com>
- Date: Sun, 22 Feb 2004 13:28:55 +0100
- Subject: [3.4 patch] installation of manual pages under the same (maybe transformed) name
this is the "backport" for 3.4 to use the same (maybe transformed)
name for the manpages. checked with sucessful installs with and
without --program-suffix. ok to checkin?
Matthias
gcc:
2004-02-12 Geoffrey Keating <geoffk@apple.com>
* Makefile.in (install-man): Use $(CPP_INSTALL_NAME) and
$(GCOV_INSTALL_NAME) to install manpages. Remove generic rule
for installing .1 manpages. Add rules for installing cpp
and gcov manpages under their installed names.
gcc/java:
2004-02-13 Geoffrey Keating <geoffk@apple.com>
* Make-lang.in: Install man pages under the same names
(possibly transformed) as the program they document.
2004-02-16 Geoffrey Keating <geoffk@apple.com>
* Make-lang.in (java.install-man): Add extra dependencies.
diff -ur gcc.old/Makefile.in gcc/Makefile.in
--- gcc.old/Makefile.in 2004-02-06 08:03:12.000000000 +0100
+++ gcc/Makefile.in 2004-02-21 19:20:52.000000000 +0100
@@ -2961,23 +2961,28 @@
# Install the man pages.
install-man: installdirs lang.install-man \
$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
- $(DESTDIR)$(man1dir)/cpp$(man1ext) \
- $(DESTDIR)$(man1dir)/gcov$(man1ext) \
+ $(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
+ $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
$(DESTDIR)$(man7dir)/gpl$(man7ext)
-$(DESTDIR)$(man1dir)/%$(man1ext): doc/%.1
+$(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1
-rm -f $@
- -$(INSTALL_DATA) $< $@
+ -$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1
+$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext): doc/cpp.1
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+ -chmod a-x $@
+
+$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): doc/gcov.1
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
diff -ur gcc.old/java/Make-lang.in gcc/java/Make-lang.in
--- gcc.old/java/Make-lang.in 2004-02-06 08:04:13.000000000 +0100
+++ gcc/java/Make-lang.in 2004-02-21 19:20:40.000000000 +0100
@@ -394,14 +394,16 @@
# Install the man pages.
java.install-man: installdirs \
$(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) \
- $(DESTDIR)$(man1dir)/gcjh$(man1ext) \
- $(DESTDIR)$(man1dir)/jv-scan$(man1ext) \
- $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) \
- $(DESTDIR)$(man1dir)/gij$(man1ext) \
- $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \
- $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \
- $(DESTDIR)$(man1dir)/rmic$(man1ext) \
- $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+ $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS:%=doc/%.1) \
+ doc/gij.1 doc/jv-convert.1 doc/rmic.1 doc/rmiregistry.1
+ for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS) \
+ gij jv-convert rmic rmiregistry ; do \
+ tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
+ man_name=$(DESTDIR)$(man1dir)/$${tool_transformed_name}$(man1ext); \
+ rm -f $$man_name ; \
+ $(INSTALL_DATA) doc/$${tool}.1 $$man_name; \
+ chmod a-x $$man_name ; \
+ done
$(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext): doc/gcj.1
-rm -f $@