procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure (package_makefile_frag): Move inserting the ${package_makefile_frag} to where it should be according to...

Browse source 
* configure (package_makefile_frag): Move inserting the
        ${package_makefile_frag} to where it should be according
        to the comment.

From-SVN: r17467
This commit is contained in:
Manfred Hollstein 1998-01-24 00:58:07 +00:00 • committed by Jeff Law
parent 3a0120cfe2
commit efd4c0ba20
2 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jan 24 01:59:45 1998 Manfred Hollstein <manfred@s-direktnet.de>
* configure (package_makefile_frag): Move inserting the
${package_makefile_frag} to where it should be according
to the comment.
Fri Jan 23 00:29:28 1998 Philip Blundell <pb@nexus.co.uk>
* config.guess: Add support for Linux/ARM.

49
configure vendored
View file

@ -1045,36 +1045,17 @@ EOF
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_frag}" in
"") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
*)
if [ ! -f ${package_makefile_frag} ] ; then
package_makefile_frag=${srcdir}/${package_makefile_frag}
fi
if [ -f ${package_makefile_frag} ] ; then
sed -e "/^####/ r ${package_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem
else
echo '***' Expected package makefile fragment \"${package_makefile_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.
rm -f ${Makefile}
case "${site}" in
"") mv ${subdir}/Makefile.tem ${Makefile} ;;
case "${site}" in
"") cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile} ;;
*)
site_makefile_frag=${srcdir}/config/ms-${site}
if [ -f ${site_makefile_frag} ] ; then
sed -e "/^####/ r ${site_makefile_frag}" ${subdir}/Makefile.tem \
> ${Makefile}
sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}
else
mv ${subdir}/Makefile.tem ${Makefile}
cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile}
site_makefile_frag=
fi
;;
@ -1115,9 +1096,27 @@ EOF
fi
;;
esac
# real copy now in ${Makefile}
# working copy now in ${Makefile}
mv ${Makefile} ${subdir}/Makefile.tem
# 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_frag}" in
"") mv ${Makefile} ${subdir}/Makefile.tem ;;
*)
if [ ! -f ${package_makefile_frag} ] ; then
package_makefile_frag=${srcdir}/${package_makefile_frag}
fi
if [ -f ${package_makefile_frag} ] ; then
sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ${subdir}/${Makefile}.tem
else
echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2
echo '***' is missing in ${PWD=`pwd`}. 1>&2
mv ${Makefile} ${subdir}/Makefile.tem
fi
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