summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2013-10-18 14:14:51 -0700
committerPhilip Chimento <philip@endlessm.com>2013-12-09 15:38:07 -0800
commit860bd26c78f33d70133ae50a136ab8af98b15cb8 (patch)
treec16252865487cdeaf755340bc44093169278abd9
parent740895d484a73e1791e7b4d4db1f14d27ae98a8a (diff)
eos-application-manifest: Install subcommands in $libexecdir
$libexecdir/eos-application-manifest, instead of $datadir/eos-application-manifest [endlessm/eos-sdk#154]
-rw-r--r--tools/Makefile.am.inc4
-rw-r--r--tools/eos-application-manifest/eos-application-manifest.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile.am.inc b/tools/Makefile.am.inc
index 6c177a5..f81694f 100644
--- a/tools/Makefile.am.inc
+++ b/tools/Makefile.am.inc
@@ -10,7 +10,7 @@ bin_SCRIPTS = \
# Makefiles. And as long as we're replacing this, go ahead and replace
# $PACKAGE_VERSION as well.
tools_edit = sed \
- -e 's|@datadir[@]|$(datadir)|g' \
+ -e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
$(NULL)
tools/eos-application-manifest/eos-application-manifest: tools/eos-application-manifest/eos-application-manifest.in Makefile
@@ -24,7 +24,7 @@ tools/eos-application-manifest/eos-application-manifest: tools/eos-application-m
CLEANFILES += tools/eos-application-manifest/eos-application-manifest
EXTRA_DIST += tools/eos-application-manifest/eos-application-manifest.in
-commandsdir = $(datarootdir)/eos-application-manifest/commands
+commandsdir = $(libexecdir)/eos-application-manifest/commands
dist_commands_DATA = \
tools/eos-application-manifest/commands/help.js \
tools/eos-application-manifest/commands/version.js \
diff --git a/tools/eos-application-manifest/eos-application-manifest.in b/tools/eos-application-manifest/eos-application-manifest.in
index 7edbcb1..382693b 100644
--- a/tools/eos-application-manifest/eos-application-manifest.in
+++ b/tools/eos-application-manifest/eos-application-manifest.in
@@ -9,7 +9,7 @@ String.prototype.format = Format.format;
System.programInvocationName = 'eos-application-manifest';
// Other constants, available from subcommands' code
-const commandSearchPath = "@datadir@/eos-application-manifest/commands";
+const commandSearchPath = "@libexecdir@/eos-application-manifest/commands";
const programVersion = "@PACKAGE_VERSION@";
// Import commands from commands/ directory (local first)