Merge branch 'install_locations'

Conflicts:
	configure.in

Makefile.am

@@ -1 +1 @@
-SUBDIRS = src 
+SUBDIRS = src data

configure.in

@@ -24,4 +24,49 @@ AC_CHECK_LIB(SDL_gfx, rotozoomSurfaceXY,,check_sdl_gfx="no")
 # Check for libpng
 AC_CHECK_LIB(png, png_read_image,,check_png="no")
 
-AC_OUTPUT(Makefile src/Makefile)
+AC_ARG_ENABLE(platform,
+			  [  --enable-platform=X        specify the targeted platform],
+			  [GMENU2X_PLATFORM="$enableval"], [GMENU2X_PLATFORM="default"])
+
+case "$GMENU2X_PLATFORM" in
+	gp2x)
+		AC_DEFINE(PLATFORM_GP2X)
+		PLATFORM="gp2x"
+		SCREEN_RES="320x240"
+	;;
+	dingux)
+		AC_DEFINE(PLATFORM_DINGUX)
+		PLATFORM="dingux"
+		SCREEN_RES="320x240"
+	;;
+	nanonote)
+		AC_DEFINE(PLATFORM_NANONOTE)
+		PLATFORM="nanonote"
+		SCREEN_RES="320x240"
+	;;
+	pandora)
+		AC_DEFINE(PLATFORM_PANDORA)
+		PLATFORM="pandora"
+		SCREEN_RES="800x480"
+	;;
+	default)
+		AC_MSG_WARN([*** No --enable-platform specified. Defaulting to "pc".])
+		AC_DEFINE(PLATFORM_PC)
+		PLATFORM="pc"
+		SCREEN_RES="800x480"
+	;;
+	pc)
+		AC_DEFINE(PLATFORM_PC)
+		PLATFORM="pc"
+		SCREEN_RES="800x480"
+	;;
+	*)
+		AC_MSG_ERROR([*** Unknown platform.])
+	;;
+esac
+
+AC_SUBST(PLATFORM)
+AC_SUBST(SCREEN_RES)
+
+
+AC_OUTPUT(Makefile src/Makefile data/Makefile)

data/Makefile.am

@@ -0,0 +1,9 @@
+
+#pkgdata_DATA = platform/@PLATFORM@ translations skins/@SCREEN_RES@
+
+install-data-local:
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/skins"
+	cp -r platform/@PLATFORM@/* "$(DESTDIR)$(pkgdatadir)"
+	cp -r translations "$(DESTDIR)$(pkgdatadir)"
+	cp -r skins/@SCREEN_RES@/* "$(DESTDIR)$(pkgdatadir)/skins"

data/platform/nanonote/gmenu2x.sh

@@ -5,7 +5,7 @@ source /etc/profile
 #setfont2 /usr/share/setfont2/un-fuzzy-6x10-font.pnm
 #loadunimap /usr/share/setfont2/ben_uni.trans
 
-setfont  /usr/share/kbd/consolefonts/kernel-6x11-font
+setfont /usr/share/kbd/consolefonts/kernel-6x11-font
 
 clear
-cd /usr/share/gmenu2x && ./gmenu2x
+/usr/bin/gmenu2x.bin