From 439020ecbc43be30c9e7b16824a0001dab286f3b Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Sat, 6 Dec 2003 13:13:20 +0000 Subject: Makefile.in (program_transform_cross_name): Delete. gcc/ 2003-12-05 Kelley Cook * 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 * 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 * 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 * Make-lang.in (GCJ_CROSS_NAME): Delete. (java.install_common, java.install-man): Adjust for above. (java.uninstall): Likewise. From-SVN: r74365 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/Make-lang.in | 27 +++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9a55a27..efb1fed 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2003-12-06 Kelley Cook + + * Make-lang.in (GCJ_CROSS_NAME): Delete. + (java.install_common, java.install-man): Adjust for above. + (java.uninstall): Likewise. + 2003-12-03 Michael Koch * class.c (make_class_data): 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) -- cgit v1.1