diff options
| author | Paul Buetow <paul@buetow.org> | 2013-04-06 13:14:48 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2013-04-06 13:14:48 +0200 |
| commit | 4ecbf33fae730bc79c4a47e6efda615b104754ad (patch) | |
| tree | dd59412b6d8bea88995211f60b786728ac30acc4 /src/configure | |
| parent | bf5fc4cc4a15e8e57db58c2e065e0f5adbd8e800 (diff) | |
tagging ychat-0.7.8ychat-0.7.8
Diffstat (limited to 'src/configure')
| -rwxr-xr-x | src/configure | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/configure b/src/configure index 125890c..eb54cce 100755 --- a/src/configure +++ b/src/configure @@ -70,7 +70,7 @@ perl -e ' remove_from_array("libmysqlclient.so",\@libs); } - if ( /\/\/#define NCURSES/ ) + elsif ( /\/\/#define NCURSES/ ) { remove_from_array("ncurses.h",\@headers); remove_from_array("libncurses.so",\@libs); @@ -156,23 +156,19 @@ perl -e ' $ofile =~ s/\.cpp/\.o/; print Fout "../obj/$ofile: $cppfile\n"; print Fout "\t\@if ! test -d `dirname ../obj/$ofile`; then mkdir -p `dirname ../obj/$ofile`; fi\n"; - my $class = $ofile; - $class =~ s/\.o//; - - my $text; - if ( $class =~ /contrib\/.+/ ) + if ( $ofile =~ /contrib\/.+/ ) { - my $dirname = `dirname $class`; - $text = "\t\@echo -n \"Contributed class $class \"\n"; + my $dirname = `dirname $ofile`; + print Fout "\t\@echo -n \"Compiling contributed class $ofile \"\n"; } else { - $text = "\t\@echo -n \"Base class $class \"\n"; + print Fout "\t\@echo -n \"Compiling base class $ofile \"\n"; } print Fout "\t\@\$(CC) \$(CFLAGS) \$(INCLUDES) $args -c -o ../obj/$ofile $cppfile\n"; - print Fout $text."\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/total// | sed \"s/ //g\"\n"; + print Fout "\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/total// | sed \"s/ //g\"\n"; } close Fout; |
