[Configure] Move lib names and dir into platform config

This eliminates the last `eq 'win32'` checks in the main Configure code.
MoarVM · Oct 26, 2013 · 80f0e1a · 80f0e1a
1 parent 8303bb3
commit 80f0e1a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -158,17 +158,17 @@
     $config{objflags}  = '@ccdef@MVM_BUILD_SHARED @ccshared@';
     $config{mainflags} = '@ccdef@MVM_SHARED';
     $config{moar}      = '@moardll@';
-    $config{moarinst}  = $config{os} eq 'win32' ? 'bin' : 'lib';
-    $config{impinst}   = $config{os} eq 'win32' ? '@moardll@.lib' : '';
+    $config{moarinst}  = $config{shareddir};
+    $config{impinst}   = $config{sharedlib},
     $config{mainlibs}  = '@lddir@. ' .
         sprintf($config{ldimp} // $config{ldusr}, $NAME);
 }
 else {
     $config{objflags}  = '';
     $config{mainflags} = '';
     $config{moar}      = '@moarlib@';
-    $config{moarinst}  = 'lib';
-    $config{impinst}   = '';
+    $config{moarinst}  = $config{staticdir};
+    $config{impinst}   = $config{staticlib};
     $config{mainlibs}  = '@moarlib@ @thirdpartylibs@ $(LDLIBS)';
 }
 

diff --git a/build/setup.pm b/build/setup.pm
@@ -133,6 +133,12 @@ our %TC_POSIX = (
     lib => 'lib%s.a',
     dll => 'lib%s.so',
 
+    shareddir => 'lib',
+    sharedlib => '',
+
+    staticdir => 'lib',
+    staticlib => '',
+
     -auxfiles => [],
 );
 
@@ -205,6 +211,12 @@ TERM
     lib => '%s.lib',
     dll => '%s.dll',
 
+    shareddir => 'bin',
+    sharedlib => '@moardll@.lib',
+
+    staticdir => 'lib',
+    staticlib => '',
+
     -auxfiles => [ qw( @name@.ilk @name@.pdb @moardll@.lib @moardll@.exp vc100.pdb ) ],
 
     -thirdparty => {