[gnome-weather/wip/new-package-js: 2/4] Switch to the new package support for relocatable apps

[Giovanni Campagna <gcampagna src gnome org>]

commit 261bc9186ff0d4cc3192af77663624838b3122f9
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Sat Feb 8 19:27:47 2014 +0100

    Switch to the new package support for relocatable apps
    
    Stop passing the prefix and libdir to package.start(), and let
    it guess it from System.programInvocationName.

 data/org.gnome.Weather.Application.service.in |    2 +-
 src/Makefile.am                               |    5 +++--
 src/org.gnome.Weather.Application.in          |    5 +----
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/data/org.gnome.Weather.Application.service.in b/data/org.gnome.Weather.Application.service.in
index 0b69597..5f777d4 100644
--- a/data/org.gnome.Weather.Application.service.in
+++ b/data/org.gnome.Weather.Application.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name= PACKAGE_NAME@
-Exec= pkgdatadir@/@PACKAGE_NAME@ --gapplication-service
+Exec= pkglibdir@/@PACKAGE_NAME@ --gapplication-service
diff --git a/src/Makefile.am b/src/Makefile.am
index b79f942..32cac01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,14 @@
 NULL =
 
 dist_bin_SCRIPTS = gnome-weather
-nodist_pkgdata_SCRIPTS = org.gnome.Weather.Application
+appdir = $(pkglibdir)
+nodist_app_SCRIPTS = org.gnome.Weather.Application
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(PACKAGE_NAME).src.gresource.xml)
 $(PACKAGE_NAME).src.gresource: $(PACKAGE_NAME).src.gresource.xml $(resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
-resourcedir = $(pkgdatadir)
+resourcedir = $(pkglibdir)
 resource_DATA = $(PACKAGE_NAME).src.gresource
 
 # Legacy, until we can depend on package.js provided by gjs
diff --git a/src/org.gnome.Weather.Application.in b/src/org.gnome.Weather.Application.in
index dc7b6bc..0273985 100644
--- a/src/org.gnome.Weather.Application.in
+++ b/src/org.gnome.Weather.Application.in
@@ -1,6 +1,3 @@
 #! GJS@
 imports.searchPath.push("@pkgdatadir@");
-imports.package.start({ name: "org.gnome.Weather.Application",
-                        version: "@PACKAGE_VERSION@",
-                        prefix: "@prefix@",
-                        libdir: "@libdir@" });
+imports.package.start({ version: "@PACKAGE_VERSION@" });