[librep] install headers to $includedir/rep/ instead of $includedir

[Christopher Bratusek <chrisb src gnome org>]

commit 46968e8f1e47e30cef9f8d49143ee9987b618a3f
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Jan 2 00:32:57 2010 +0100

    install headers to $includedir/rep/ instead of $includedir

 debian/librep-dev.install.standard |    2 +-
 librep.spec.in                     |    2 +-
 src/Makefile.in                    |   11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/debian/librep-dev.install.standard b/debian/librep-dev.install.standard
index acf0aed..9b72c3a 100644
--- a/debian/librep-dev.install.standard
+++ b/debian/librep-dev.install.standard
@@ -1,4 +1,4 @@
-usr/include
+usr/include/rep
 usr/bin/repdoc
 usr/bin/rep-xgettext
 usr/lib/*.{so,la,a}
diff --git a/librep.spec.in b/librep.spec.in
index b62f1f5..688b3d5 100644
--- a/librep.spec.in
+++ b/librep.spec.in
@@ -87,7 +87,7 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/rep-xgettext
 %{_bindir}/repdoc
-%{_includedir}/rep*.h
+%{_includedir}/rep/
 %{_libdir}/rep/%{_host}/
 %{_libdir}/pkgconfig/librep.pc
 %{_libdir}/librep.so
diff --git a/src/Makefile.in b/src/Makefile.in
index f9e570b..f611927 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -27,7 +27,7 @@ COMMON_SRCS =	continuations.c datums.c debug-buffer.c files.c find.c \
 		streams.c structures.c symbols.c tuples.c values.c weak-refs.c
 UNIX_SRCS =	unix_dl.c unix_files.c unix_main.c unix_processes.c
 
-INSTALL_HDRS = rep.h rep_lisp.h rep_regexp.h rep_subrs.h rep_gh.h
+INSTALL_HDRS = rep.h rep_lisp.h rep_regexp.h rep_subrs.h rep_gh.h rep_config.h
 
 SRCS = $(COMMON_SRCS) $(UNIX_SRCS)
 OBJS = $(SRCS:.c=.lo)
@@ -101,15 +101,14 @@ install : all installdirs
 	printf "\nrep_open_globally=yes\n" \
 	  >>$(DESTDIR)${repexecdir}/rep/i18n/gettext.la
 	for i in $(INSTALL_HDRS); do \
-	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir); \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/rep/; \
 	done
-	$(INSTALL_DATA) rep_config.h $(DESTDIR)$(repcommonexecdir)
 	$(SHELL) $(top_srcdir)/install-aliases -c . $(DESTDIR)$(repexecdir)
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
 	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(repexecdir)/$(x)) \
-	  $(DESTDIR)$(includedir)
+	  $(DESTDIR)$(includedir)/rep/
 
 uninstall :
 	$(LIBTOOL) rm $(DESTDIR)${libdir}/librep.la
@@ -120,9 +119,7 @@ uninstall :
 	for dl in $(DL_DSTS); do \
 	  $(LIBTOOL) rm $(DESTDIR)${repexecdir}/$$dl; \
 	done
-	for i in $(INSTALL_HDRS); do \
-	  rm $(DESTDIR)$(includedir)/$$i; \
-	done
+	rm -rf $(DESTDIR)$(includedir)/rep/; \
 
 repdoc : repdoc.o
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(GDBM_LIBS)