git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure (package_makefile_rules_frag): New variable, which names a file with generic rules, ... 

* configure (package_makefile_rules_frag): New variable, which names
        a file with generic rules, ...
        Change comment to mention we now have FIVE parts.
        * configure: Undo last change.

From-SVN: r17522
This commit is contained in:
Manfred Hollstein 1998-01-27 22:23:50 +00:00 committed by Jeff Law
parent 4c46bad038
commit 59739e3ce9
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jan 27 23:25:06 1998 Manfred Hollstein <manfred@s-direktnet.de>
* configure (package_makefile_rules_frag): New variable, which names
a file with generic rules, ...
Change comment to mention we now have FIVE parts.
* configure: Undo last change.
Tue Jan 27 23:15:55 1998 Lassi A. Tuura <lat@iki.fi> Tue Jan 27 23:15:55 1998 Lassi A. Tuura <lat@iki.fi>
* config.guess: More accurate determination of HP processor types. * config.guess: More accurate determination of HP processor types.

48
configure vendored
View File

@ -62,6 +62,7 @@ moveifchange=
norecursion= norecursion=
other_options= other_options=
package_makefile_frag= package_makefile_frag=
package_makefile_rules_frag=
prefix=/usr/local prefix=/usr/local
progname= progname=
program_prefix= program_prefix=
@ -81,7 +82,7 @@ subdirs=
target_alias=NOTARGET target_alias=NOTARGET
target_makefile_frag= target_makefile_frag=
undefs=NOUNDEFS undefs=NOUNDEFS
version="$Revision: 1.7 $" version="$Revision: 1.22 $"
x11=default x11=default
### we might need to use some other shell than /bin/sh for running subshells ### we might need to use some other shell than /bin/sh for running subshells
@ -1038,24 +1039,43 @@ EOF
# been somewhat optimized and is perhaps a bit twisty. # been somewhat optimized and is perhaps a bit twisty.
# code is order so as to try to sed the smallest input files we know. # code is order so as to try to sed the smallest input files we know.
# so do these separately because I don't trust the order of sed -e expressions.
# the four makefile fragments MUST end up in the resulting Makefile in this order: # the five makefile fragments MUST end up in the resulting Makefile in this order:
# package, target, host, and site. so do these separately because I don't trust the # package macros, target, host, site, and package rules.
# order of sed -e expressions.
if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then
# Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem.
rm -f ${subdir}/${Makefile}.tem
case "${package_makefile_rules_frag}" in
"") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
*)
if [ ! -f ${package_makefile_rules_frag} ] ; then
package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag}
fi
if [ -f ${package_makefile_rules_frag} ] ; then
sed -e "/^####/ r ${package_makefile_rules_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem
else
echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2
echo '***' is missing in ${PWD=`pwd`}. 1>&2
cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
fi
esac
# working copy now in ${Makefile}.tem
# Conditionalize for this site. # Conditionalize for this site.
rm -f ${Makefile} rm -f ${Makefile}
case "${site}" in case "${site}" in
"") cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile} ;; "") mv ${subdir}/Makefile.tem ${Makefile} ;;
*) *)
site_makefile_frag=${srcdir}/config/ms-${site} site_makefile_frag=${srcdir}/config/ms-${site}
if [ -f ${site_makefile_frag} ] ; then if [ -f ${site_makefile_frag} ] ; then
sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile} sed -e "/^####/ r ${site_makefile_frag}" ${subdir}/Makefile.tem \
> ${Makefile}
else else
cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile} mv ${subdir}/Makefile.tem ${Makefile}
site_makefile_frag= site_makefile_frag=
fi fi
;; ;;
@ -1098,8 +1118,8 @@ EOF
esac esac
# working copy now in ${Makefile} # working copy now in ${Makefile}
# Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem. # Emit the default values of this package's macros.
rm -f ${subdir}/${Makefile}.tem rm -f ${subdir}/Makefile.tem
case "${package_makefile_frag}" in case "${package_makefile_frag}" in
"") mv ${Makefile} ${subdir}/Makefile.tem ;; "") mv ${Makefile} ${subdir}/Makefile.tem ;;
*) *)
@ -1107,17 +1127,13 @@ EOF
package_makefile_frag=${srcdir}/${package_makefile_frag} package_makefile_frag=${srcdir}/${package_makefile_frag}
fi fi
if [ -f ${package_makefile_frag} ] ; then if [ -f ${package_makefile_frag} ] ; then
sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ${subdir}/${Makefile}.tem sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
else else
echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2 echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2
echo '***' is missing in ${PWD=`pwd`}. 1>&2 echo '***' is missing in ${PWD=`pwd`}. 1>&2
mv ${Makefile} ${subdir}/Makefile.tem mv ${Makefile} ${subdir}/Makefile.tem
fi fi
esac esac
# real copy now in ${subdir}/${Makefile}.tem
mv ${subdir}/${Makefile}.tem ${subdir}/Makefile.tem 2>/dev/null
# real copy now in ${subdir}/Makefile.tem # real copy now in ${subdir}/Makefile.tem
# prepend warning about editting, and a bunch of variables. # prepend warning about editting, and a bunch of variables.