[sawfish] install headers to $includedir/sawfish/

[Christopher Bratusek <chrisb src gnome org>]

commit 14d9b2e4d6973777932f8f91c89ddfe92773c078
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Jan 2 01:01:02 2010 +0100

    install headers to $includedir/sawfish/

 ChangeLog              |   10 ++++++++++
 debian/sawfish.install |    1 +
 sawfish.pc.in          |    2 +-
 sawfish.spec.in        |    1 +
 src/Makefile.in        |   10 +++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c5a4b9d..d7b3e80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,16 @@
 	                 to make use of [required for sawfish-pager 0.8]
 
 	* man/news.texi: revised and updated	
+	
+	* sawfish.pc.in
+	* sawfish.spec.in
+	* debian/sawfish.install
+	* src/Makefile.in: install headers to $includedir/sawfish/
+
+	* src/client.c
+	* src/sawfish.h: updated for librep 0.90.5 header directory change
+
+	* src/sawfish.h: include config.h, if available, else sawfish_config.h
 
 2009-12-30  Timo Korvola <tkorvola iki fi>
 	* lisp/sawfish/wm/commands/shrink-yank.jl: fixed docstrings
diff --git a/debian/sawfish.install b/debian/sawfish.install
index 2c503cd..27e1fc9 100644
--- a/debian/sawfish.install
+++ b/debian/sawfish.install
@@ -5,5 +5,6 @@ usr/share/kde4/apps/ksmserver/windowmanagers/sawfish.desktop
 usr/share/sawfish/sawfish.png
 usr/share/xsessions/sawfish.desktop
 usr/share/sawfish/*/lisp/sawfish/cfg/main.jlc
+usr/include/sawfish/
 usr/lib
 usr/bin
diff --git a/sawfish.pc.in b/sawfish.pc.in
index 1a67012..4a7022a 100644
--- a/sawfish.pc.in
+++ b/sawfish.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@
+includedir= includedir@/sawfish/
 
 sawfishhosttype= host@
 imageloader= imageloader@
diff --git a/sawfish.spec.in b/sawfish.spec.in
index 2fc05f0..b8304b9 100644
--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/sawfish/%{version}/%{_host}
 %{rep_execdir}/sawfish
 %{_infodir}/sawfish*
+%{_includedir}/sawfish/
 
 %changelog
 * Sat Sep 05 2009 Kim B. Heino <b bbbs net>
diff --git a/src/Makefile.in b/src/Makefile.in
index bfadc71..e3fa1dc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -37,6 +37,8 @@ DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/flippers.la \
 	  sawfish/wm/util/x.la sawfish/wm/util/selection.la
 DL_DIRS = sawfish/wm/util
 
+INSTALL_HDRS = sawfish.h sawfish_subrs.h libclient.h server.h keys.h build.h
+
 override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(PANGO_CFLAGS)
 
 all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style
@@ -68,6 +70,10 @@ install : all installdirs
 	  $(notdir $(x)) $(DESTDIR)$(sawfishexecdir)/$(dir $(x));)
 	$(rep_INSTALL_ALIASES) -c $(srcdir) $(DESTDIR)$(sawfishexecdir)
 	$(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) client.la $(DESTDIR)$(repexecdir)/sawfish/
+	for i in $(INSTALL_HDRS); do \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/sawfish/; \
+	done
+	$(INSTALL_DATA) $(top_srcdir)/config.h $(DESTDIR)$(includedir)/sawfish/sawfish_config.h
 
 uninstall :
 	for p in sawfish; do \
@@ -79,10 +85,12 @@ uninstall :
 	  $(rep_LIBTOOL) --mode=uninstall rm -f $(DESTDIR)${sawfishexecdir}/$$dl; \
 	done
 	$(rep_DL_UNINSTALL) -f $(DESTDIR)$(repexecdir)/sawfish/client.la
+	rm -rf $(DESTDIR)$(includedir)/sawfish/
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
-	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x))
+	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x)) \
+	  $(DESTDIR)$(includedir)/sawfish/
 
 .libexec : $(DL_OBJS)
 	$(SHELL) $(srcdir)/fake-libexec