Index: ja2-0.12.1r6466/Makefile
===================================================================
--- ja2-0.12.1r6466.orig/Makefile	2009-07-23 17:11:21.000000000 +0100
+++ ja2-0.12.1r6466/Makefile	2009-07-24 08:49:24.000000000 +0100
@@ -102,6 +102,10 @@
 
 CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
 
+ifdef WITH_MAEMO
+  CFLAGS += $(BUILDFLAGS)
+endif
+
 CCFLAGS += $(CFLAGS)
 CCFLAGS += -std=gnu99
 CCFLAGS += -Werror-implicit-function-declaration
@@ -486,6 +490,12 @@
 	@echo '===> CC $<'
 	$(Q)$(CC) $(CCFLAGS) -c $< -o $@
 
+ifdef WITH_MAEMO
+  Build/Strategic/Queen_Command.o: Build/Strategic/Queen_Command.cc
+	@echo '===> CXX $<'
+	$(Q)$(CXX) $(CXXFLAGS) -O1 -c $< -o $@
+endif
+
 .cc.o:
 	@echo '===> CXX $<'
 	$(Q)$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -504,11 +514,21 @@
 
 install: $(BINARY)
 	@echo '===> INSTALL'
-	$(Q)$(INSTALL) -d $(PREFIX)/bin $(MANPREFIX)/man/man6 $(PREFIX)/share/applications $(PREFIX)/share/pixmaps
-	$(Q)$(INSTALL_PROGRAM) $(BINARY) $(PREFIX)/bin
-	$(Q)$(INSTALL_MAN) ja2.6 $(MANPREFIX)/man/man6
-	$(Q)$(INSTALL_DATA) ja2-stracciatella.desktop $(PREFIX)/share/applications
+ifdef WITH_MAEMO
+	$(Q)$(INSTALL) -d $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(MANPREFIX)/man/man6 $(DESTDIR)/$(PREFIX)/share/applications/hildon
+else
+	$(Q)$(INSTALL) -d $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(MANPREFIX)/man/man6 $(DESTDIR)/$(PREFIX)/share/applications $(DESTDIR)/$(PREFIX)/share/pixmaps
+endif
+	$(Q)$(INSTALL_PROGRAM) $(BINARY) $(DESTDIR)/$(PREFIX)/bin
+	$(Q)$(INSTALL_MAN) ja2.6 $(DESTDIR)/$(MANPREFIX)/man/man6
+ifdef WITH_MAEMO
+	$(Q)$(INSTALL_DATA) ja2-stracciatella.desktop $(DESTDIR)/$(PREFIX)/share/applications/hildon
+else
+	$(Q)$(INSTALL_DATA) ja2-stracciatella.desktop $(DESTDIR)/$(PREFIX)/share/applications
+endif
+ifndef WITH_MAEMO
 	$(Q)$(INSTALL_DATA) Build/Res/jagged3.ico $(PREFIX)/share/pixmaps/jagged2.ico
+endif
 
 deinstall:
 	@echo '===> DEINSTALL'
