summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@t-online.de>2013-02-17 10:44:45 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2013-02-17 10:44:45 +0100
commited2f9e01ebbfff5ba37abb35cde7ed6098334830 (patch)
treec986a04556d4158a90816a75e57ffd15bfb5310e /data
parentec37a25d4d505bbf067010e18b59b7e793894432 (diff)
downloadzeitgeist-ed2f9e01ebbfff5ba37abb35cde7ed6098334830.tar.gz
data: clean up and install bash-completion file
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am5
-rw-r--r--data/completions/zeitgeist-daemon (renamed from data/zeitgeist-daemon.bash_completion)0
-rw-r--r--data/ontology/Makefile.am12
3 files changed, 10 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 677f88f6..cf52e030 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,13 +11,16 @@ org.gnome.zeitgeist.service: org.gnome.zeitgeist.service.in
$(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@
org.gnome.zeitgeist.service: Makefile
+bashcompletiondir = $(datadir)/bash-completion/completions
+dist_bashcompletion_DATA = completions/zeitgeist-daemon
+
CLEANFILES = \
org.gnome.zeitgeist.service \
PythonSerializer.pyc \
$(NULL)
+
EXTRA_DIST = \
org.gnome.zeitgeist.service.in \
- zeitgeist-daemon.bash_completion \
ontology2code \
$(NULL)
diff --git a/data/zeitgeist-daemon.bash_completion b/data/completions/zeitgeist-daemon
index 6fef7f58..6fef7f58 100644
--- a/data/zeitgeist-daemon.bash_completion
+++ b/data/completions/zeitgeist-daemon
diff --git a/data/ontology/Makefile.am b/data/ontology/Makefile.am
index 85e577b8..4a4ea420 100644
--- a/data/ontology/Makefile.am
+++ b/data/ontology/Makefile.am
@@ -1,4 +1,7 @@
-ontology_trig_DATA = \
+NULL =
+
+ontology_trigdir = $(pkgdatadir)/ontology
+dist_ontology_trig_DATA = \
zg.trig \
nie.trig \
nco.trig \
@@ -6,9 +9,6 @@ ontology_trig_DATA = \
ncal.trig \
nao.trig \
nmo.trig \
- nmm.trig
-
-ontology_trigdir = $(datadir)/zeitgeist/ontology
+ nmm.trig \
+ $(NULL)
-EXTRA_DIST = \
- $(ontology_trig_DATA)