summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-19 18:44:20 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-19 18:44:20 +0000
commit789506bf30e612d1c4676e8511a55a328c30bfd1 (patch)
tree759befb82b5572c2cb23f931ea963b5d852f989e
parentd13cd5ca80b969b823fbbfcc31531fc0ea897c04 (diff)
Fix freebsd glitches
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8740 e03df62e-2008-0410-955e-edbf42e46eb7
-rwxr-xr-xconfigure14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index 57010992a..5c23eb02f 100755
--- a/configure
+++ b/configure
@@ -1298,9 +1298,9 @@ EOF
$tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
$tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
$tmp =~ s/\@MODULES\@/$modules/;
- $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/;
- $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/;
- $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/;
+ $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/ if defined $config{STARTSCRIPT};
+ $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/ if defined $config{DESTINATION};
+ $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/ if defined $config{EXTRA_DIR};
$tmp =~ s/\@EXECUTABLE\@/$exe/;
$tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
$tmp =~ s/\@VERSION\@/$version/;
@@ -1594,14 +1594,14 @@ sub write_dynamic_makefile
print " done!\n";
}
- my $freebsd4libs = $config{CRAQ};
+ my $freebsd4libs = (defined $config{CRAQ} ? $config{CRAQ} : "");
my $all = "all: ";
my $all_libsonly = "";
- my $libraryext;
- my $othercrap;
- my $RPATH;
+ my $libraryext = "";
+ my $othercrap = "";
+ my $RPATH = "";
if ($config{IS_DARWIN} eq "YES")
{