diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-24 13:27:30 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-24 13:32:32 -0500 |
| commit | daa2e0ab7191d28e09b312322ee29eecaaae13fb (patch) | |
| tree | ca0e708f0a0f00a919c3cd99a4946ecca1a8c2d2 | |
| parent | 115039fb493dad6c2eef9118049e3b6b62424e8e (diff) | |
libexecdir is provided by automake, and gnome-settings-daemon is not always in /usr/libexecdir, use the dir from automake
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | data/autostart/autostart.in (renamed from data/autostart/autostart) | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 67d6e8b4..bcd7ba0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/data/autostart/autostart b/data/autostart/autostart.in index abd92669..1c261a0f 100644 --- a/data/autostart/autostart +++ b/data/autostart/autostart.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 |