[gnome-weather/wip/new-package-js: 13/14] Use package.js from gjs

[Giovanni Campagna <gcampagna src gnome org>]

commit be0445c6e52cf4a169e800ffdae75c8e29799b6f
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Sat Feb 8 20:23:11 2014 +0100

    Use package.js from gjs
    
    Replace our copy with the upstream one, and remove the hacks
    we had to run with it.

 configure.ac                         |    1 +
 src/Makefile.am                      |   16 +--
 src/org.gnome.Weather.Application.in |    1 -
 src/package.js                       |  254 ----------------------------------
 4 files changed, 3 insertions(+), 269 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 189e30c..fb6a574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,7 @@ AC_CONFIG_FILES([
   data/icons/Makefile
   libgd/Makefile
   src/Makefile
+  src/org.gnome.Weather.Application
   tests/Makefile
   po/Makefile.in
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index bb3ce5c..3f9383b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,20 +10,6 @@ $(PACKAGE_NAME).src.gresource: $(PACKAGE_NAME).src.gresource.xml $(resource_file
 resourcedir = $(pkglibdir)
 resource_DATA = $(PACKAGE_NAME).src.gresource
 
-# Legacy, until we can depend on package.js provided by gjs
-jsdir = $(pkgdatadir)
-dist_js_DATA = package.js
-
-org.gnome.Weather.Application: org.gnome.Weather.Application.in
-       $(AM_V_GEN) sed \
-               -e "s|[ ]GJS@|$(GJS)|g" \
-               -e "s|[ ]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-               -e "s|[ ]prefix@|$(prefix)|g" \
-               -e "s|[ ]libdir@|$(libdir)|g" \
-               -e "s|[ ]pkgdatadir@|$(pkgdatadir)|g" \
-               $< > $@
-       @chmod +x $@
-
 EXTRA_DIST = \
        $(PACKAGE_NAME).in \
        $(PACKAGE_NAME).src.gresource.xml \
@@ -40,5 +26,7 @@ install-exec-hook:
        $(LN_S) $(appdir)/$(PACKAGE_NAME) $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)
 uninstall-hook:
        -rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)
+all-local:
+       @chmod +x $(PACKAGE_NAME)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/org.gnome.Weather.Application.in b/src/org.gnome.Weather.Application.in
old mode 100644
new mode 100755
index 0273985..137e163
--- a/src/org.gnome.Weather.Application.in
+++ b/src/org.gnome.Weather.Application.in
@@ -1,3 +1,2 @@
 #! GJS@
-imports.searchPath.push("@pkgdatadir@");
 imports.package.start({ version: "@PACKAGE_VERSION@" });