diff options
| author | Manfred Hollstein <manfred@s-direktnet.de> | 1998-01-24 00:58:07 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-01-23 17:58:07 -0700 |
| commit | efd4c0ba2074a5523aff44e8d03ed6e51e17e97a (patch) | |
| tree | d3347e655d7c66ed6a39f3928e4f07bbfab2870c /configure | |
| parent | 3a0120cfe23d2916a5b1cc875c9c944243fbb888 (diff) | |
| download | gcc-efd4c0ba2074a5523aff44e8d03ed6e51e17e97a.zip gcc-efd4c0ba2074a5523aff44e8d03ed6e51e17e97a.tar.gz gcc-efd4c0ba2074a5523aff44e8d03ed6e51e17e97a.tar.bz2 | |
configure (package_makefile_frag): Move inserting the ${package_makefile_frag} to where it should be according to...
* configure (package_makefile_frag): Move inserting the
${package_makefile_frag} to where it should be according
to the comment.
From-SVN: r17467
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 49 |
1 files changed, 24 insertions, 25 deletions
@@ -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} + + # 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 ${Makefile} ${subdir}/Makefile.tem + mv ${subdir}/${Makefile}.tem ${subdir}/Makefile.tem 2>/dev/null # real copy now in ${subdir}/Makefile.tem |