configure.in (cpp_install_dir): Initialize from $enable_cpp if that's looking like...

        * configure.in (cpp_install_dir): Initialize from $enable_cpp
        if that's looking like a pathname.
        * configure: Rebuilt.
        * Makefile.in (install-cpp, uninstall-cpp): cpp_install_dir is an
        absolute pathname, not a $prefix relative pathname.

Co-Authored-By: Jeffrey A Law <law@cygnus.com>
From-SVN: r25632

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2a975d4cf8699082eb316ca2e7155eecd7d4056..b8474864f04d26ca8c55c3d3e6865290c9b24764 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar  8 01:16:30 1999  Manfred Hollstein  <manfred@s-direktnet.de>
+                         Jeff Law <law@cygnus.com>
+
+       * configure.in (cpp_install_dir): Initialize from $enable_cpp
+       if that's looking like a pathname.
+       * configure: Rebuilt.
+
+       * Makefile.in (install-cpp, uninstall-cpp): cpp_install_dir is an
+       absolute pathname, not a $prefix relative pathname.
+
 Fri Mar  5 01:19:22 1999  Jeffrey A Law  (law@cygnus.com)
 
        Thu Dec 17 18:21:49 1998  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index ecc4dec59bce15eb89086c9da7ede98c17121737..15a789ed7c4e2e79b6eae62a5962dc968031d5dc 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2283,8 +2283,8 @@ install-cpp: cpp.sh
        -rm -f $(bindir)/cpp
        $(INSTALL_PROGRAM) -m 755 cpp.sh $(bindir)/cpp
        if [ x$(cpp_install_dir) != x ]; then \
-         rm -f $(prefix)/$(cpp_install_dir)/cpp; \
-         $(INSTALL_PROGRAM) -m 755 cpp.sh $(prefix)/$(cpp_install_dir)/cpp; \
+         rm -f $(cpp_install_dir)/cpp; \
+         $(INSTALL_PROGRAM) -m 755 cpp.sh $(cpp_install_dir)/cpp; \
        else true; fi
 
 cpp.sh: $(srcdir)/cpp.in Makefile
@@ -2294,7 +2294,7 @@ cpp.sh: $(srcdir)/cpp.in Makefile
 uninstall-cpp:
        -rm -f $(bindir)/cpp
        -if [ x$(cpp_install_dir) != x ]; then \
-         rm -f $(prefix)/$(cpp_install_dir)/cpp; \
+         rm -f $(cpp_install_dir)/cpp; \
        else true; fi
 
 # Install float.h for cross compiler.

diff --git a/gcc/configure b/gcc/configure
index db1cf41d8f7cd21131ca3ef288d73accf270390f..d34121741c768dccd18b9c1ad9bbe8ecf384f89a 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -2221,8 +2221,6 @@ host_xm_defines=
 host_xmake_file=
 host_truncate_target=
 host_exeext=
-
-# It is relative to $prefix.
 cpp_install_dir=
 
 # Decode the host machine, then the target machine.
@@ -5102,6 +5100,13 @@ fi
 if [ x$enable_cpp != x ]
 then
   tmake_file="$tmake_file t-install-cpp"
+  case x$enable_cpp in
+    xyes | xno) ;;
+    x/*) cpp_install_dir=$enable_cpp ;;
+    x.*) echo "alternate cpp script installation directory must be an absolute path" 1>&2
+       exit 1
+       ;;
+  esac
 fi
 
 # Say what files are being used for the output code and MD file.
@@ -5404,7 +5409,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:5408: checking assembler alignment features" >&5
+echo "configure:5413: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,gcc$,gas,'`

diff --git a/gcc/configure.in b/gcc/configure.in
index 752a0c353c06e365f0801f6656a80235286154ad..a9438303297b35f09ee27c67d1f47a78d6fdafa1 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -242,8 +242,6 @@ host_xm_defines=
 host_xmake_file=
 host_truncate_target=
 host_exeext=
-
-# It is relative to $prefix.
 cpp_install_dir=
 
 # Decode the host machine, then the target machine.
@@ -3123,6 +3121,13 @@ fi
 if [[ x$enable_cpp != x ]]
 then
   tmake_file="$tmake_file t-install-cpp"
+  case x$enable_cpp in
+    xyes | xno) ;;
+    x/*) cpp_install_dir=$enable_cpp ;;
+    x.*) echo "alternate cpp script installation directory must be an absolute path" 1>&2
+       exit 1
+       ;;
+  esac
 fi
 
 # Say what files are being used for the output code and MD file.