--- ./odalaunch/Makefile.orig	2009-03-08 00:28:10.000000000 -0500
+++ ./odalaunch/Makefile	2009-05-16 18:32:01.000000000 -0400
@@ -11,11 +11,11 @@
 
 HEADERS = src/*.h
 
-CC = g++
-LD = g++
+CC = $(CXX)
+LD = $(CC)
 
-WXCONFIG = wx-config
-WXRC = wxrc
+WXCONFIG = $(WX_CONFIG)
+WXRC = $(WXRC_CMD)
 
 # Sometimes wx-config will uee the lowest version available, which is what
 # we do no want! -- GhostlyDeath
