diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /Makefile.am | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c72a40b3..786b97b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox secretbindir = $(libdir)/openbox +appsdir = $(datadir)/applications theme = Clearlooks @@ -423,6 +424,9 @@ nodist_pkgconfig_DATA = \ ## data ## +dist_apps_DATA = \ + data/openbox.desktop + dist_pixmap_DATA = \ data/openbox.png |