[polari] build: Install js files into root pkgdatadir



commit 21493f0d5826394f512d89c82d8ee0efabc28c3a
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Feb 22 23:22:42 2015 +0100

    build: Install js files into root pkgdatadir
    
    Can't say I like it, but it's what the package module imposes. In any
    case, this is just temporary until we move sources into a gresource.

 src/Makefile.am |    2 +-
 src/polari.in   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 27d4b95..41a7887 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ bin_SCRIPTS = polari
 polari: polari.in
        $(AM_V_GEN) $(do_subst) $< > $@
 
-jsdir = $(pkgdatadir)/js/
+jsdir = $(pkgdatadir)/
 dist_js_DATA = \
        accountsMonitor.js \
        application.js \
diff --git a/src/polari.in b/src/polari.in
index fc8ad85..fa8f7ea 100644
--- a/src/polari.in
+++ b/src/polari.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export GJS_PATH="@pkgdatadir@/js${GJS_PATH:+:$GJS_PATH}"
+export GJS_PATH="@pkgdatadir ${GJS_PATH:+:$GJS_PATH}"
 export GI_TYPELIB_PATH="@pkglibdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
@@ -17,4 +17,4 @@ if test x"$POLARI_RUN_DEBUG" != x; then
     DEBUG_COMMAND="gdb --args"
 fi
 
-exec $DEBUG_COMMAND @GJS_CONSOLE@ -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();" "$@"
+exec $DEBUG_COMMAND @GJS_CONSOLE@ -I @pkgdatadir@ -c "const Main = imports.main; Main.start();" "$@"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]