From 80f0e1a6e91c7ec9e5337c6aeedb7071ff4cf914 Mon Sep 17 00:00:00 2001
From: Brian Gernhardt <brian@gernhardtsoftware.com>
Date: Sat, 26 Oct 2013 14:11:56 -0400
Subject: [PATCH] [Configure] Move lib names and dir into platform config

This eliminates the last `eq 'win32'` checks in the main Configure
code.
---
 Configure.pl   |  8 ++++----
 build/setup.pm | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Configure.pl b/Configure.pl
index e6e71c2f4b..e6d7372d0a 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -158,8 +158,8 @@
     $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);
 }
@@ -167,8 +167,8 @@
     $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
index a78c2c5a9f..2b1d48a0e6 100755
--- 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 => {