libexecdir is provided by automake, and gnome-settings-daemon is not always in /usr/libexecdir, use the dir from automake
This commit is contained in:
parent
115039fb49
commit
daa2e0ab71
2 changed files with 8 additions and 3 deletions
|
@ -12,7 +12,6 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
|
|||
rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
|
||||
pixmapdir = $(datadir)/pixmaps
|
||||
xsddir = $(datadir)/openbox
|
||||
libexecdir = $(prefix)/libexec
|
||||
appsdir = $(datadir)/applications
|
||||
|
||||
theme = Clearlooks
|
||||
|
@ -462,6 +461,10 @@ edit = $(SED) \
|
|||
-e 's!@libexecdir\@!$(libexecdir)!' \
|
||||
-e 's!@bindir\@!$(bindir)!'
|
||||
|
||||
data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
|
||||
@echo make: creating $@
|
||||
@$(edit) $< >$@
|
||||
|
||||
data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
|
||||
@echo make: creating $@
|
||||
@$(edit) $< >$@
|
||||
|
@ -493,6 +496,8 @@ nodist_xsessions_DATA = \
|
|||
dist_noinst_DATA = \
|
||||
data/rc.xsd \
|
||||
data/menu.xsd \
|
||||
data/autostart/autostart.in \
|
||||
data/autostart/openbox-autostart.in \
|
||||
data/xsession/openbox.desktop.in \
|
||||
data/xsession/openbox-gnome.desktop.in \
|
||||
data/xsession/openbox-kde.desktop.in \
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
# If you want to use GNOME config tools...
|
||||
#
|
||||
#if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
|
||||
# /usr/libexec/gnome-settings-daemon &
|
||||
#if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
|
||||
# @libexecdir@/gnome-settings-daemon &
|
||||
#elif which gnome-settings-daemon >/dev/null; then
|
||||
# gnome-settings-daemon &
|
||||
#fi
|
Loading…
Reference in a new issue