Install data/* at "make install" time; have PIONEER_DATA_DIR set via configure.

configure.ac

@@ -68,5 +68,8 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_CONFIG_FILES([Makefile src/Makefile src/collider/Makefile src/lua/Makefile src/oolua/Makefile])
+PIONEER_DATA_DIR="${PIONEER_DATA_DIR:-data}"
+AC_ARG_VAR([PIONEER_DATA_DIR], [where Pioneer expects its data files to be ["./data"]])
+
+AC_CONFIG_FILES([Makefile data/Makefile src/Makefile src/collider/Makefile src/lua/Makefile src/oolua/Makefile])
 AC_OUTPUT

data/Makefile.am

@@ -0,0 +1,2 @@
+pioneerdatadir = @PIONEER_DATA_DIR@
+nobase_pioneerdata_DATA = $(shell $(srcdir)/listdata.sh)

data/listdata.exclude

@@ -0,0 +1,3 @@
+^Makefile
+^listdata
+/Thumbs\.db$

data/listdata.sh

@@ -0,0 +1,3 @@
+#! /bin/sh -e
+cd "`dirname "$0"`"
+find * -type f | grep -vf listdata.exclude | sort | sed -e 's/[ '\'']/\\&/g'

src/CommodityTradeWidget.cpp

@@ -43,7 +43,15 @@ void CommodityTradeWidget::ShowAll()
 
 		if (!m_seller->DoesSell((Equip::Type)i)) continue;
 		int stock = m_seller->GetStock(static_cast<Equip::Type>(i));
-		Gui::Image *img = new Gui::Image((PIONEER_DATA_DIR "/icons/goods/" + std::string(EquipType::types[i].name) + ".png").c_str() );
+
+		// need to replace spaces in the item name
+		std::string imgname = std::string(EquipType::types[i].name);
+		size_t imgbad;
+		while ((imgbad = imgname.find(' ')) != std::string::npos) {
+			imgname.replace(imgbad, 1, "_");
+		}
+		Gui::Image *img = new Gui::Image((PIONEER_DATA_DIR "/icons/goods/" + imgname + ".png").c_str() );
+
 		innerbox->Add(img,0, num*YSEP);
 		Gui::Label *l = new Gui::Label(EquipType::types[i].name);
 		if (EquipType::types[i].description)

src/Makefile.am

@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS = collider/ lua/ oolua/
+AM_CPPFLAGS = -DPIONEER_DATA_DIR=@PIONEER_DATA_DIR@
 
 bin_PROGRAMS = pioneer modelviewer
 noinst_LIBRARIES = libgui.a

src/Player.cpp

@@ -289,7 +289,7 @@ bool Player::FireMissile(int idx, Ship *target)
 	if (!Ship::FireMissile(idx, target))
 		return false;
 	
-	Sound::PlaySfx("Missile launch", 1.0f, 1.0f, 0);
+	Sound::PlaySfx("Missile_launch", 1.0f, 1.0f, 0);
 	return true;
 }