🚀 go-pugleaf

The addition of the family of --prefix options to `configure' broke the
ability to specify prefix information in the `config/x-*' makefile fragments.
What happens is that, if no --prefix option is specified, the prefix is
always set to `/usr/local', irrespective of the value in the machine
configuration file.

The following patch causes configure to use --prefix if available, otherwise
uses the config/x-* file value if available, otherwise defaults the prefix
to /usr/local.  It also fixes a similar problem in --exec-prefix.

This problem is new to 2.3.1.

-- 
Joe Korty,  REAL/IX Operating Systems

MODCOMP, an AEG Company			Telephone: (305) 977-1820
1650 West McNab Road			Fax:	   (305) 977-1638
P.O. Box 6099				E-mail:	   uunet!modcomp!joe
Ft. Lauderdale, FL 33309-1088

diff -r -c /work3/joe/gcc-2.3.1-base/configure /work4/joe/gcc-2.3.1/configure
*** /work3/joe/gcc-2.3.1-base/configure	Sun Nov  1 03:25:32 1992
--- /work4/joe/gcc-2.3.1/configure	Tue Nov 10 10:54:48 1992
***************
*** 54,61 ****
--- 54,63 ----
  
  # Default prefix to /usr/local.
  prefix=/usr/local
+ prefix_name=SomeJunkString
  # Default is to let the Makefile set exec_prefix from $(prefix)
  exec_prefix='$(prefix)'
+ exec_prefix_name=SomeJunkString
  
  remove=rm
  hard_link=ln
***************
*** 132,137 ****
--- 134,140 ----
  	;;
       -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
  	prefix=`echo $arg | sed 's/-*p[a-z]*=//'`
+ 	prefix_name=prefix
  	;;
       -exec-prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre \
  	| --exec-pr | --exec-p | --exec- | --exec | --exe | --ex | --e)
***************
*** 141,146 ****
--- 144,150 ----
  	| --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* | --exec=* \
  	| --exe=* | --ex=* | --e=*)
  	exec_prefix=`echo $arg | sed 's/-*e[-a-z]*=//'`
+ 	exec_prefix_name=exec_prefix
  	;;
       -with-gnu-ld | --with-gnu-ld | --with-gnu-l)
  	gnu_ld=yes
***************
*** 1256,1263 ****
  sed -e "s///" -e "s/^target=.*$/target=${target}/" \
      -e "s|^xmake_file=.*$|xmake_file=${host_xmake_file}|" \
      -e "s|^tmake_file=.*$|tmake_file=${tmake_file}|" \
!     -e "s|^prefix[ 	]*=.*|prefix = $prefix|" \
!     -e "s|^exec_prefix[ 	]*=.*|exec_prefix = $exec_prefix|" \
      -e "s|^FIXINCLUDES[ 	]*=.*|FIXINCLUDES = $fixincludes|" \
      Makefile.tem > Makefile.xx
  rm -f Makefile.tem
--- 1265,1272 ----
  sed -e "s///" -e "s/^target=.*$/target=${target}/" \
      -e "s|^xmake_file=.*$|xmake_file=${host_xmake_file}|" \
      -e "s|^tmake_file=.*$|tmake_file=${tmake_file}|" \
!     -e "s|^${prefix_name}[ 	]*=.*|prefix = $prefix|" \
!     -e "s|^${exec_prefix_name}[ 	]*=.*|exec_prefix = $exec_prefix|" \
      -e "s|^FIXINCLUDES[ 	]*=.*|FIXINCLUDES = $fixincludes|" \
      Makefile.tem > Makefile.xx
  rm -f Makefile.tem