--- trunk/data/Makefile.in	2009/07/16 18:43:30	29
+++ trunk/data/Makefile.in	2009/10/14 11:26:50	135
@@ -1,5 +1,6 @@
 APP = @PACKAGE@
-PREFIX = @prefix@
+prefix = @prefix@
+datarootdir = @datarootdir@
 datadir = @datarootdir@
 
 LANGS = en_GB de_DE fi_FI
@@ -10,28 +11,29 @@
 clean:
 
 install-debian:
-#	install -m 644 help/gpxview.html $(DESTDIR)$(PREFIX)/share/$(APP)
+#	install -m 644 help/gpxview.html $(DESTDIR)$(prefix)/share/$(APP)
 
 install-maemo:
-	install -d $(DESTDIR)$(PREFIX)$(datadir)/applications/hildon
-	install $(APP).desktop $(DESTDIR)$(PREFIX)$(datadir)/applications/hildon
+	# the path to /share is hardcoded since datapath points to /opt on fremantle
+	install -d $(DESTDIR)$(prefix)/share/applications/hildon
+	install $(APP).desktop $(DESTDIR)$(prefix)/share/applications/hildon
 	for s in 40 26; do \
-	  install -d $(DESTDIR)$(PREFIX)$(datadir)/icons/hicolor/$${s}x$${s}/hildon ;\
-	  install -m 644 $(APP).$$s.png $(DESTDIR)$(PREFIX)$(datadir)/icons/hicolor/$${s}x$${s}/hildon/$(APP).png ;\
+	  install -d $(DESTDIR)$(prefix)/share/icons/hicolor/$${s}x$${s}/hildon ;\
+	  install -m 644 $(APP).$$s.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${s}x$${s}/hildon/$(APP).png ;\
 	done
-	install -d $(DESTDIR)$(PREFIX)$(datadir)/icons/hicolor/scalable/hildon
-	install -m 644 $(APP).64.png $(DESTDIR)$(PREFIX)$(datadir)/icons/hicolor/scalable/hildon/$(APP).png
+	install -d $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/hildon
+	install -m 644 $(APP).64.png $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/hildon/$(APP).png
 	for LANG in $(LANGS_HELP); do \
-		install -d $(DESTDIR)$(PREFIX)/share/osso-help/$${LANG} ;\
-		install -m 644 ../help/$${LANG}/*.xml $(DESTDIR)$(PREFIX)/share/osso-help/$${LANG} ;\
+		install -d $(DESTDIR)$(prefix)/share/osso-help/$${LANG} ;\
+		install -m 644 ../help/$${LANG}/*.xml $(DESTDIR)$(prefix)/share/osso-help/$${LANG} ;\
 	done
 
 install: @INSTALL_PLATTFORM@
-	install -d $(DESTDIR)$(PREFIX)/share/$(APP)
-	install -m 644 icons/*.gif icons/*.png $(DESTDIR)$(PREFIX)/share/$(APP)
-	install -m 644 welcome.gpx icons/*.png $(DESTDIR)$(PREFIX)/share/$(APP)
+	install -d $(DESTDIR)$(datadir)/$(APP)
+	install -m 644 icons/*.gif icons/*.png $(DESTDIR)$(datadir)/$(APP)
+	install -m 644 welcome.gpx icons/*.png $(DESTDIR)$(datadir)/$(APP)
 	for LANG in $(LANGS); do \
-		install -d $(DESTDIR)$(PREFIX)/share/locale/$${LANG}/LC_MESSAGES ;\
-		msgfmt ../po/$${LANG}.po -o $(DESTDIR)$(PREFIX)/share/locale/$${LANG}/LC_MESSAGES/$(APP).mo ;\
+		install -d $(DESTDIR)$(prefix)/share/locale/$${LANG}/LC_MESSAGES ;\
+		msgfmt ../po/$${LANG}.po -o $(DESTDIR)$(prefix)/share/locale/$${LANG}/LC_MESSAGES/$(APP).mo ;\
 	done