From: Dana Jansens <danakj@orodu.net>
Date: Thu, 28 Feb 2008 00:37:48 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=26cc41f6c6187dabd5c7ee4365c8fa44751009e5

Merge branch 'backport' into work
---

26cc41f6c6187dabd5c7ee4365c8fa44751009e5
diff --cc Makefile.am
index dd5bb6c5,fa8f65d3..ec6157b2
--- a/Makefile.am
+++ b/Makefile.am
@@@ -8,10 -8,10 +8,11 @@@ rcdir           = $(configdir)/openbo
  xsessionsdir    = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
  pkgconfigdir    = $(libdir)/pkgconfig
 -pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
  pixmapdir       = $(datadir)/pixmaps
  xsddir          = $(datadir)/openbox
+ secretbindir    = $(libdir)/openbox
  
  theme = Clearlooks