[gnome-shell] Config: use sed for substituting variables
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Config: use sed for substituting variables
- Date: Tue, 14 Feb 2012 18:17:13 +0000 (UTC)
commit 62c0088dd81d01a35bd10d15e959c6ee29536051
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sat Feb 11 18:44:35 2012 +0100
Config: use sed for substituting variables
Substitutions generated by configure don't resolve prefixes, so
cannot be used for paths. Config already had localedir, and next
commit will need libexecdir and sysconfdir, so just bite the bullet
and move to sed.
https://bugzilla.gnome.org/show_bug.cgi?id=658484
configure.ac | 1 -
js/Makefile.am | 14 ++++++++++++++
js/misc/config.js.in | 3 +++
3 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 272dbf2..cacf35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,6 @@ AC_CONFIG_FILES([
docs/reference/st/Makefile
docs/reference/st/st-docs.sgml
js/Makefile
- js/misc/config.js
src/Makefile
browser-plugin/Makefile
tests/Makefile
diff --git a/js/Makefile.am b/js/Makefile.am
index 14a25b5..f3413ba 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -1,4 +1,18 @@
+EXTRA_DIST = misc/config.js.in
+
+misc/config.js: misc/config.js.in Makefile
+ sed -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
+ -e "s|[ ]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
+ -e "s|[ ]GJS_VERSION@|$(GJS_VERSION)|g" \
+ -e "s|[ ]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+ -e "s|[ ]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
+ -e "s|[ ]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
+ -e "s|[ ]datadir@|$(datadir)|g" \
+ -e "s|[ ]libexecdir@|$(libexecdir)|g" \
+ -e "s|[ ]sysconfdir@|$(sysconfdir)|g" \
+ $< > $@
+
jsdir = $(pkgdatadir)/js
nobase_dist_js_DATA = \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 6cbf932..4a0db16 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -14,3 +14,6 @@ const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
/* locale dir */
const LOCALEDIR = '@datadir@/locale';
+/* other standard directories */
+const LIBEXECDIR = '@libexecdir@';
+const SYSCONFDIR = '@sysconfdir@';
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]