diff options
| author | Kelley Cook <kcook@gcc.gnu.org> | 2003-12-06 13:13:20 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2003-12-06 13:13:20 +0000 |
| commit | 439020ecbc43be30c9e7b16824a0001dab286f3b (patch) | |
| tree | b86b5724ce01d19ca1b1178bbf558e06866fd1f5 /gcc/java/Make-lang.in | |
| parent | df2ef49bbf1d8e81db688fb49ddaf7e614b71961 (diff) | |
| download | gcc-439020ecbc43be30c9e7b16824a0001dab286f3b.zip gcc-439020ecbc43be30c9e7b16824a0001dab286f3b.tar.gz gcc-439020ecbc43be30c9e7b16824a0001dab286f3b.tar.bz2 | |
Makefile.in (program_transform_cross_name): Delete.
gcc/
2003-12-05 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (program_transform_cross_name): Delete.
(GCC_CROSS_NAME, CPP_CROSS_NAME): Delete.
(PROTOIZE_CROSS_NAME, UNPROTOIZE_CROSS_NAME): Delete.
(AR_FOR_TARGET, RANLIB_FOR_TARGET, NM_FOR_TARGET): Adjust for above.
(install_cpp, install_driver, install-man, uninstall): Likewise.
gcc/cp
2003-12-05 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (GXX_CROSS_NAME, CXX_CROSS_NAME): Delete.
(c++.install_common, cp/g++.1, c++.install-man): Adjust for above.
(c++.uninstall): Likewise.
gcc/f
2003-12-05 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (G77_CROSS_NAME): Delete.
(g77.install_common, g77.install-man, g77.uninstall): Adjust for above.
gcc/java
2003-12-05 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (GCJ_CROSS_NAME): Delete.
(java.install_common, java.install-man): Adjust for above.
(java.uninstall): Likewise.
From-SVN: r74365
Diffstat (limited to 'gcc/java/Make-lang.in')
| -rw-r--r-- | gcc/java/Make-lang.in | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index e7a5bae..fc6adf9 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -45,9 +45,6 @@ JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'` JAVA_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcj|sed '$(program_transform_name)'` GCJH_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcjh|sed '$(program_transform_name)'` -# Actual names to use when installing a cross-compiler. -JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'` - GCJ = gcj # Define the names for selecting java in LANGUAGES. @@ -187,14 +184,12 @@ java.install-normal: # be explicitly prefixed) and native builds. java.install-common: installdirs -if [ -f $(GCJ)$(exeext) ]; then \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - chmod a+x $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + true; \ else \ - rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(JAVA_INSTALL_NAME)$(exeext) $(JAVA_TARGET_INSTALL_NAME)$(exeext) ); \ @@ -218,9 +213,7 @@ java.install-man: java.uninstall: -rm -rf $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext) - -rm -rf $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext) -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) - -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/gcjh$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/jv-scan$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) @@ -404,15 +397,9 @@ rmiregistry.pod: java/gcj.texi # Install the man pages. java.install-man: installdirs $(GENERATED_JAVA_MANPAGES) -if [ -f $(GCJ)$(exeext) ]; then \ - if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - else \ - rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - fi ; \ + rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ fi -rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext) -$(INSTALL_DATA) $(docobjdir)/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext) |