Automatically generate weston.ini with the right paths

Previously weston.ini had hardcoded paths for the weston-* clients in
/usr/bin and /usr/libexec. This was a bit annoying when testing Weston
because you wouldn't usually install those in the system prefix. This
patch adds a make rule to automatically generate weston.ini from a
template file with some replacement markers for the paths so that they
can have the right prefix.
This commit is contained in:
Neil Roberts
2013-11-22 16:46:00 +00:00
committed by Kristian Høgsberg
parent bf3c1c6913
commit e3de16ea30
3 changed files with 15 additions and 5 deletions
+1
View File
@@ -28,6 +28,7 @@ cscope.out
/missing /missing
/stamp-h1 /stamp-h1
/test-driver /test-driver
/weston.ini
Makefile Makefile
Makefile.in Makefile.in
TAGS TAGS
+10 -1
View File
@@ -6,4 +6,13 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
EXTRA_DIST = weston.ini wayland-scanner.mk EXTRA_DIST = weston.ini.in wayland-scanner.mk
weston.ini : $(srcdir)/weston.ini.in
$(AM_V_GEN)$(SED) \
-e 's|@bindir[@]|$(bindir)|g' \
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
$< > $@
all-local : weston.ini
+4 -4
View File
@@ -27,7 +27,7 @@ path=/usr/bin/gnome-terminal
[launcher] [launcher]
icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
path=/usr/bin/weston-terminal path=@bindir@/weston-terminal
[launcher] [launcher]
icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png
@@ -35,15 +35,15 @@ path=/usr/bin/google-chrome
[launcher] [launcher]
icon=/usr/share/icons/gnome/24x24/apps/arts.png icon=/usr/share/icons/gnome/24x24/apps/arts.png
path=./clients/weston-flower path=@abs_top_builddir@/clients/weston-flower
[screensaver] [screensaver]
# Uncomment path to disable screensaver # Uncomment path to disable screensaver
path=/usr/libexec/weston-screensaver path=@libexecdir@/weston-screensaver
duration=600 duration=600
[input-method] [input-method]
path=/usr/libexec/weston-keyboard path=@libexecdir@/weston-keyboard
#[output] #[output]
#name=LVDS1 #name=LVDS1