perl 5.003_01: lib/Carp.pm

[p5sagit/p5-mst-13.2.git] / x2p / cflags.SH

diff --git a/x2p/cflags.SH b/x2p/cflags.SH
old mode 100644 (file)
new mode 100755 (executable)
index db857c0..531ef65
--- a/x2p/cflags.SH
+++ b/x2p/cflags.SH
@@ -1,43 +1,43 @@
 case $CONFIG in
 '')
-    if test ! -f config.sh; then
-       ln ../config.sh . || \
-       ln ../../config.sh . || \
-       ln ../../../config.sh . || \
-       (echo "Can't find config.sh."; exit 1)
-    fi
-    . config.sh
-    ;;
+       if test -f config.sh; then TOP=.;
+       elif test -f ../config.sh; then TOP=..;
+       elif test -f ../../config.sh; then TOP=../..;
+       elif test -f ../../../config.sh; then TOP=../../..;
+       elif test -f ../../../../config.sh; then TOP=../../../..;
+       else
+               echo "Can't find config.sh."; exit 1
+       fi
+       . $TOP/config.sh
+       ;;
 esac
 : This forces SH files to create target in same directory as SH file.
 : This is so that make depend always knows where to find SH derivatives.
 case "$0" in
 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
 esac
-echo "Extracting cflags (with variable substitutions)"
+echo "Extracting x2p/cflags (with variable substitutions)"
 : This section of the file will have variable substitutions done on it.
 : Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
 : Protect any dollar signs and backticks that you do not want interpreted
 : by putting a backslash in front.  You may delete these comments.
-rm -f cflags
 $spitshell >cflags <<!GROK!THIS!
 !GROK!THIS!
 
 : In the following dollars and backticks do not need the extra backslash.
 $spitshell >>cflags <<'!NO!SUBS!'
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
 case $CONFIG in
 '')
-    if test ! -f config.sh; then
-       ln ../config.sh . || \
-       ln ../../config.sh . || \
-       ln ../../../config.sh . || \
-       (echo "Can't find config.sh."; exit 1)
-    fi 2>/dev/null
-    . ./config.sh
-    ;;
+       if test -f config.sh; then TOP=.;
+       elif test -f ../config.sh; then TOP=..;
+       elif test -f ../../config.sh; then TOP=../..;
+       elif test -f ../../../config.sh; then TOP=../../..;
+       elif test -f ../../../../config.sh; then TOP=../../../..;
+       else
+               echo "Can't find config.sh."; exit 1
+       fi
+       . $TOP/config.sh
+       ;;
 esac
 
 also=': '
@@ -49,7 +49,7 @@ case $# in
 0) set *.c; echo "The current C flags are:" ;;
 esac
 
-set `echo "$* " | sed 's/\.[oc] / /g'`
+set `echo "$* " | sed -e 's/\.[oc] / /g' -e 's/\.obj / /g'`
 
 for file do
 
@@ -74,12 +74,14 @@ for file do
     *) ;;
     esac
 
+    ccflags="`echo $ccflags | sed -e 's/-DEMBED//'`"
+
     echo "$cc -c $ccflags $optimize $large $split"
     eval "$also "'"$cc -c $ccflags $optimize $large $split"'
 
-    . ./config.sh
+    . $TOP/config.sh
 
 done
 !NO!SUBS!
-chmod +x cflags
+chmod 755 cflags
 $eunicefix cflags