Author: vedge
Date: 2008-09-27 02:51:54 -0300 (Sat, 27 Sep 2008)
New Revision: 729
Modified:
trunk/mkconfigure.pl
Log:
- don't quote variables in C_INCDIR().
- pre-check for any conflicting ./config files.
Modified: trunk/mkconfigure.pl
===================================================================
--- trunk/mkconfigure.pl 2008-09-02 02:27:18 UTC (rev 728)
+++ trunk/mkconfigure.pl 2008-09-27 05:51:54 UTC (rev 729)
@@ -70,7 +70,7 @@
my $dir = shift;
my $qdir = $dir;
- if ($dir =~ /^\$/) { $qdir = '\"'.$dir.'\"'; }
+# if ($dir =~ /^\$/) { $qdir = '\"'.$dir.'\"'; }
MkDefine('CFLAGS', '$CFLAGS -I'.$qdir);
MkDefine('CXXFLAGS', '$CXXFLAGS -I'.$qdir);
MkSaveMK('CFLAGS');
@@ -84,7 +84,7 @@
{
my $dir = shift;
- if ($dir =~ /^\$/) { $qdir = '\"'.$dir.'\"'; }
+# if ($dir =~ /^\$/) { $qdir = '\"'.$dir.'\"'; }
MkDefine('LIBS', '$LIBS -L'.$dir);
MkSaveMK('LIBS');
@@ -428,7 +428,19 @@
do
echo "Argument: $arg" >> config.log
done
-mkdir config 1>/dev/null 2>&1
+if [ -e "config" ]; then
+ if [ -f "config" ]; then
+ echo "File ./config is in the way. Please remove it first."
+ exit 1;
+ else
+ rm -fR config;
+ fi
+fi
+mkdir config
+if [ $? != 0 ]; then
+ echo "Could not create ./config/ directory."
+ exit 1
+fi
HAVE_MANDOC="no"
NROFF=""
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
