From 40b6fc31d728556ef70d8a00ebd6b939829fd45f Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 3 Feb 2005 01:30:33 +0000
Subject: [PATCH] More jockeying to make things happy with Linux and FreeBSD.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3332 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml                                     |   6 +++---
 .../threerings/util/keybd/Linux/libkeybd.so   | Bin 8241 -> 8129 bytes
 .../threerings/util/signal/FreeBSD/Makefile   |   5 +++++
 .../com/threerings/util/signal/Linux/Makefile |   5 +++++
 .../threerings/util/unsafe/Linux/libunsafe.so | Bin 8364 -> 8252 bytes
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index e7da8186c..caaf7e1a8 100644
--- a/build.xml
+++ b/build.xml
@@ -108,11 +108,11 @@
 
   <!-- build the native libraries -->
   <target name="ncompile" depends="prepare">
-    <exec dir="src/java/com/threerings/util/keybd/i686-Linux" 
+    <exec dir="src/java/com/threerings/util/keybd/${os.name}" 
      executable="make"><arg line="install"/></exec>
-    <exec dir="src/java/com/threerings/util/signal/i686-Linux" 
+    <exec dir="src/java/com/threerings/util/signal/${os.name}" 
      executable="make"><arg line="install"/></exec>
-    <exec dir="src/java/com/threerings/util/unsafe/i686-Linux" 
+    <exec dir="src/java/com/threerings/util/unsafe/${os.name}" 
      executable="make"><arg line="install"/></exec>
   </target>
 
diff --git a/src/java/com/threerings/util/keybd/Linux/libkeybd.so b/src/java/com/threerings/util/keybd/Linux/libkeybd.so
index 37c5a608c7f21b42c6788c476494b82661d308bd..e43ea176c1cfdd3d02e0977ba0fe38208b2389a5 100755
GIT binary patch
delta 1655
zcmb`HO=uHA7>2*uCK$K**~F%#G{&@5gM}n!Lwiu9MO1pwQd&Vg*`E{}8iJ4r;$^jX
z@*ssdE99Uz!8R8?N)IB45eW#QAXv2pK|=)v(fH2pW|KAtVRc|8`+R@<&X=888GSsm
z9A#Hl`g+_f&8OY_*>KyM<`wq{`^0^ozEkgsNWvs?FtH{x*}`ISAv32YFXpndbIHv7
zY<4CepS_&TWen2=HIYuJiA*6CR}UwO^M#_yuY1%XyP09`^F~Y|iZ0~IzX*vR$tR}l
z??YF^2Yu1;HK>s2DptmRdS$Fkw20Ym(INiKH!)uN?`6w(loPDH?!VE&p7U&QK>F?F
zw}J<q5g$>GKMD@8oBVAs#)vz+W6tSbqM354dyDxOAf+)JRI69`P-vg}x?#evux{?)
zo&IsgheHwVJem`A8L<+{l-0i{gGHGlcpdK+gONf@;LjHOX&L;@;sD(SyDj!m2^<QG
zTrs=oJ{~5T@6%`vh8Imkn}7=Z8&*Mu-hjVa?59nzVzHOLgIfi4;GA5Nb^Z7*Wa=@_
zjc#y|R;#zQ(}*<#YW3|2wffFR{=L!7f}*3_>S-`s+oq^izYBIXb|iUd6|C$wib#@7
zPr+TL-;ey4X1;=*2N3oST-{~F2gpSq!Do?w2BrWy(A$B0@F-XlhA|k#IF2a_oHJQA
z3oe37NSM_9GTj4<|5OYG0#?Bf%oYczlOCG+9R7aHs>w(3Eb4DG^EJJ|7c-zC;1~Eu
z%MSNAh{7!|41vWM!xRM%fVUtpud_@k(+{L5=1G%Z;b@8YNy~rC2(W+g*uOvr`BJ#w
T_VpX%oqMacv*YE{kq_(-X&6zh

delta 1758
zcmcJQO=uHA7>2*urdZdc*(?cGn%MM5YYR<Cdl3cON<}FMt$Haa+9ah0(nd+@!GjBm
z9t1%cig*!3kA+xr6``J`Y7x8@4-q_6NT`BZYJ6vRvQ1LKL*l?p@_c{u&X=9d%JA~Y
z!ytRP+<CysBK(T8=dbHq=P=vmZdd2zPa;w<i5yI<;j5{+nec2XlbQ?1XQGMe`S5Hq
z5sigoH`3wgLLwOtB~!8Kq-DK47#a!<hT`eSK;&pBGn38?@oZq=R3db~0hJ8DpMPpS
zC^c%P#<d1%jEvTQQcK^7sa0rF=q^^qwpvxJO!Sh~ze6_A#~0lbQ%nDIhulSNjOCtq
z?lrMr{E)9(>38#S-{IzQH_>gr;Ok~@_+wu$8{;d!-sb1+L=SRbeVfdahN|*#P_gux
z7x#BW3S|>Mg|$?}wf+<zZR;>@qGQ1pD^wws?we1e#iGh0IFGHxV5HGA@P^GES_Xf!
zS*KTEr_C;U4Q}&`Trs`0iZ2s8`x%sn;oXj5mw*ENU+jV!ZG#Iodq~AC(rj*}HgKh&
z9`H5Q)Q^WnrDN8uGYt+hiltrMv|?pIu~eN<EY<e$pM8el@(>-Zs%OBkRHdj`dJk?X
zpGa}hI#}Cll~5FwzJtBe??L`=nXh3Z9bwKUq7Qqlc%52E2VX$`S(tQm;566^9swJ|
zkbyyrlbE8w9m%RJ_z3(I3Fl0|N^4;8n~I@9z&iMaY_U%JC@=Fl{9Pi*Ar_+Jn4-QH
zEb|SsK)Vbm3+My?s5s#;*k7^Xn2bLo3r>PJA#mPgl`cs?kb;=kC4a=t5&~}7epC<v
f4R~ob?)94u^z$SBu93R`5e)xU-9>WQfUf)j)@^|?

diff --git a/src/java/com/threerings/util/signal/FreeBSD/Makefile b/src/java/com/threerings/util/signal/FreeBSD/Makefile
index 1b72264d2..eb4185d6c 100644
--- a/src/java/com/threerings/util/signal/FreeBSD/Makefile
+++ b/src/java/com/threerings/util/signal/FreeBSD/Makefile
@@ -15,6 +15,7 @@ MKDIR=mkdir
 ROOT=../../../../../../..
 LIBRARIES_PATH=
 OSINCDIR!=uname -s | tr 'A-Z' 'a-z'
+INSTALL_PATH=${ROOT}/dist/lib/i386-FreeBSD
 
 #
 # Parameter and file definitions
@@ -28,6 +29,10 @@ TARGET=libsignal.so
 
 all: ${TARGET}
 
+install: ${TARGET}
+	@${MKDIR} -p ${INSTALL_PATH}
+	cp ${TARGET} ${INSTALL_PATH}
+
 ${TARGET}: com_threerings_util_signal_SignalManager.c
 	@echo "Compiling SignalManager.c"
 	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
diff --git a/src/java/com/threerings/util/signal/Linux/Makefile b/src/java/com/threerings/util/signal/Linux/Makefile
index bb07eab94..f53e1c26c 100644
--- a/src/java/com/threerings/util/signal/Linux/Makefile
+++ b/src/java/com/threerings/util/signal/Linux/Makefile
@@ -15,6 +15,7 @@ MKDIR=mkdir
 ROOT=../../../../../../..
 LIBRARIES_PATH=
 OSINCDIR:=$(shell uname -s | tr 'A-Z' 'a-z')
+INSTALL_PATH=${ROOT}/dist/lib/i686-Linux
 
 #
 # Parameter and file definitions
@@ -28,6 +29,10 @@ TARGET=libsignal.so
 
 all: ${TARGET}
 
+install: ${TARGET}
+	@${MKDIR} -p ${INSTALL_PATH}
+	cp ${TARGET} ${INSTALL_PATH}
+
 ${TARGET}: com_threerings_util_signal_SignalManager.c
 	@echo "Compiling SignalManager.c"
 	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
diff --git a/src/java/com/threerings/util/unsafe/Linux/libunsafe.so b/src/java/com/threerings/util/unsafe/Linux/libunsafe.so
index 8ec0577e95086ae542909858eb3eced6e2880793..8ab8af64e795d906e0087781cc49a90e61e3ac1c 100755
GIT binary patch
delta 1684
zcmb`HO=uHA6vy9e5?W(EcB2UuV~kCqT4|yQ3VxJUD8)kw1w|ATX_C@LgH)4>h!82g
zc(8<yM+FN#c(7s#s0R_Gf;ZbkPwK%hkRAjV(H<1ye|9I^v^fZ=18;VJZ)V>6&zs$O
zc<gykDXc7NbFBpzOYo1bHg>SCPw>6&BkU_5cJJ!@OhgKd$j(F`%VhHxV<VY#JT{!m
zrqZ#@P%1lksWUZ}&1Fp2`FJ!DjYl*2{hjfB(ZW!^5a*AB9bM@wg>3Xh;}L><*b|b1
zR723~4GEg^HXmqoH-;8I?hPmBp+TYR=o$O%aiV9UP^{rX?cr_eKyv!Ohb{k7ds+FY
zZ^Fjj@R$CG<CK>u%rE=5@IQXlaTS!~S|H;1gyMcP{QUuyo#y8P?T%;Li6+Xo0za5G
z0%g@^C%v-3Z@27>zpc9P6yD`^ynZ~%_+(3{cm}ol-ek^I$Vpk_BQsfqDS&%|CNolL
z9DLkjjY{AFi+ywtJOZtvF>=#1xPWmyU|VSxFX3im7^mhe(mWjZR~>Z%7BJpxB~a--
zxZh%pmccnIp@&w$wSsK;c}h+zA#F2%Cc|N;qF$*hr#V+n&?{>f=#}+_{CA;O1B!~S
ziC2W<<{CwMWd{5O6?uep;z;Je*RW$dSd{Q7I8)uR;-**N57i1PPI?EP*+k^Sd>_`k
zY(%4SzJ`2$uxJrjQB2w`9e409_^{+z$w|qFBwqmEmEVkynrT#y3xOJJ94yXUG!+Ra
z!BaJYUVxu~yOG~esKc=+&&WrcX$AZf6G{jmb`TMf(KxIX)(x&r&<8##6N(+41>dL<
qFeulH7-86$#a*VO@jG$jw`zaGcVIhD?^tShb;p#qsr(>hSN;Ma^k0Vn

delta 1762
zcmcJPO=uHA6vy9eQyOE_W<ygdjWIUCppt~79;$-2&_Wf#ioNtC&4+0)ZNx;8qC^Uc
z2tshwQx8@>#$t(h5b@yMQp9UPv0el*Q55{B@juzgHc1a&)`2&>zc(}Q{pZc@JRd9!
z<=sk`eW@?o&O-cMyO)JG^&!63dXTO2gmveMA4H_Uh)hiM!Kw6gJeWvl)6>CNJd&K8
z2_{m>NHiF|kO@Z4CsVONDjl6nY2H)eKz|?{h-E_l&_Ey?&t&`g=icz30YRL6pwlJg
z*{bqh8zj#^G7~sy$VP?6Lleu;rO;LMjQ#4cpl70#%!pF%=ASypCJO&EL-C1im=(XP
z*IL+5e%aw+b9}+!YrWq|G{;{#Jc?K4UmUyGJm1#sYyI6z^td?E{gtU1sH!y+l`9|k
zk)9plQq6^@@K&0*c|6Vd(H>WB79}gSX>%2_(2eTXsIdrh2R!K1n30VhfJb#!X$d^0
zvz=amr=V3dMpk+W&SD%7SQjnh#ci$*<M1pwT7%=>hGUa}62^!11U6a+AJbVS3;v>%
zp0I;@!1aQ>;JigoNC&jPuIeyRu3XtvPHnE7P_8sCC|8;b`R_t+1QZo*h?j$-(4eSX
zSpl!1B8yljj${>l5j!@4MG4=7W3?SCRw{wt)+(r2sI7(Q;T9r0=G(D;0DM-?SCMZB
zESd+F6O+cJ<2K#}pO*Yc@~q_jlJA1&<u_v|GtJ9!Ay9=ag2kDOW<$bf;9GTqK7yZu
z4<mn7;dZQCk!NJ5t>giJ!-PBnh#edkk<mD;4|WDzpWqyLTqYDdybiupC*Y=BFJic1
k3p$T#4nuAwL$2RF{ED;Bh<n_}|2W?m5y)TM=Q1mQ0em5fx&QzG