From efd4c0ba2074a5523aff44e8d03ed6e51e17e97a Mon Sep 17 00:00:00 2001
From: Manfred Hollstein <manfred@s-direktnet.de>
Date: Sat, 24 Jan 1998 00:58:07 +0000
Subject: [PATCH] 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
---
ChangeLog | 6 ++++++
configure | 49 ++++++++++++++++++++++++-------------------------
2 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b86a3381c5a2..092a764d8dca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/configure b/configure
index 1c3cc7c386a6..06af22bb67b1 100755
--- a/configure
+++ b/configure
@@ -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
--
GitLab