Don't install the unwashed masses of Guile header files in the

main #include path; put most of them in a subdirectory called
'libguile'.  This avoids naming conflicts between Guile header
files and system header files (of which there were a few).
* Makefile.in (pkgincludedir): Deleted.
(innerincludedir): New variable; this and $(includedir) are enough.
(INCLUDE_CFLAGS): Search for headers in "-I$(srcdir)/..".
(installed_h_files): Divide this up.  Now this variable lists
those header files which should go into $(includedir) (i.e. appear
directly in the #include path), and ...
(inner_h_files): ... this new variable says which files appear in
a subdirectory, and are referred to as <libguile/mumble.h>.
(h_files): List them both.
(install): Create innerincludedir, not pkgincludedir.  Put
the installed_h_files and inner_h_files in their proper places.
(uninstall): Corresponding changes.
* alist.h, append.h, arbiters.h, async.h, boolean.h, chars.h,
continuations.h, debug.h, dynwind.h, error.h, eval.h, fdsocket.h,
feature.h, fports.h, gc.h, genio.h, gsubr.h, hash.h, init.h,
ioext.h, kw.h, libguile.h, list.h, markers.h, marksweep.h,
mbstrings.h, numbers.h, options.h, pairs.h, ports.h, posix.h,
print.h, procprop.h, procs.h, ramap.h, read.h, root.h,
sequences.h, smob.h, socket.h, srcprop.h, stackchk.h, stime.h,
strings.h, strop.h, strorder.h, strports.h, struct.h, symbols.h,
tag.h, throw.h, unif.h, variable.h, vectors.h, version.h,
vports.h, weaks.h: Find __scm.h in its new location.
* __scm.h: Find scmconfig.h and tags.h in their new locations
(they're both "inner" files).

libguile/__scm.h

@@ -119,7 +119,7 @@ typedef unsigned long ulong_long;
 
 
 /* What did the configure script discover about the outside world?  */
-#include <scmconfig.h>
+#include <libguile/scmconfig.h>
 
 
 /* Write prototype declarations like this:
@@ -166,7 +166,7 @@ typedef unsigned long ulong_long;
 #endif /* def HAVE_LIMITS_H */
 
 
-#include "tags.h"
+#include <libguile/tags.h>
 
 
 #ifdef vms

libguile/alist.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/append.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/arbiters.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/async.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/boolean.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/chars.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 /* Immediate Characters

libguile/continuations.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/debug.h

@@ -48,7 +48,7 @@
 
 
 #include "options.h"
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/dynwind.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/error.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 #include "pairs.h"
 
 

libguile/eval.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/feature.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/filesys.h

@@ -45,7 +45,7 @@
 
 
 #include <stdio.h>
-#include "_scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/fports.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/gc.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #define SCM_FREEP(x) (SCM_CAR(x)==scm_tc_free_cell)

libguile/genio.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 #include "ports.h"
 
 

libguile/gsubr.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/hash.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/init.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/ioext.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/kw.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/libguile.h

@@ -45,7 +45,7 @@
 
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -61,80 +61,79 @@
 # endif /* def _SIZE_T */
 #endif /* def STDC_HEADERS */
 
-#include "smob.h"
+#include <libguile/smob.h>
 
 
 
-#include "alist.h"
-#include "append.h"
-#include "arbiters.h"
-#include "async.h"
-#include "boolean.h"
-#include "chars.h"
-#include "continuations.h"
+#include <libguile/alist.h>
+#include <libguile/append.h>
+#include <libguile/arbiters.h>
+#include <libguile/async.h>
+#include <libguile/boolean.h>
+#include <libguile/chars.h>
+#include <libguile/continuations.h>
 #ifdef DEBUG_EXTENSIONS
-#include "debug.h"
+#include <libguile/debug.h>
 #endif
-#include "dynwind.h"
-#include "eq.h"
-#include "error.h"
-#include "eval.h"
-#include "extchrs.h"
-#include "fdsocket.h"
-#include "feature.h"
-#include "files.h"
-#include "filesys.h"
-#include "fports.h"
-#include "gc.h"
-#include "genio.h"
-#include "gsubr.h"
-#include "hash.h"
-#include "hashtab.h"
-#include "init.h"
-#include "ioext.h"
-#include "kw.h"
-#include "libguile.h"
-#include "list.h"
-#include "load.h"
-#include "mallocs.h"
-#include "markers.h"
-#include "marksweep.h"
-#include "mbstrings.h"
-#include "numbers.h"
-#include "objprop.h"
-#include "options.h"
-#include "pairs.h"
-#include "params.h"
-#include "ports.h"
-#include "posix.h"
-#include "print.h"
-#include "procprop.h"
-#include "procs.h"
-#include "ramap.h"
-#include "read.h"
-#include "root.h"
-#include "scmsigs.h"
-#include "sequences.h"
-#include "simpos.h"
-#include "socket.h"
-#include "srcprop.h"
-#include "stackchk.h"
-#include "stime.h"
-#include "strings.h"
-#include "strop.h"
-#include "strorder.h"
-#include "strports.h"
-#include "struct.h"
-#include "symbols.h"
-#include "tag.h"
-#include "tags.h"
-#include "throw.h"
-#include "unif.h"
-#include "variable.h"
-#include "vectors.h"
-#include "version.h"
-#include "vports.h"
-#include "weaks.h"
+#include <libguile/dynwind.h>
+#include <libguile/eq.h>
+#include <libguile/error.h>
+#include <libguile/eval.h>
+#include <libguile/extchrs.h>
+#include <libguile/fdsocket.h>
+#include <libguile/feature.h>
+#include <libguile/files.h>
+#include <libguile/filesys.h>
+#include <libguile/fports.h>
+#include <libguile/gc.h>
+#include <libguile/genio.h>
+#include <libguile/gsubr.h>
+#include <libguile/hash.h>
+#include <libguile/hashtab.h>
+#include <libguile/init.h>
+#include <libguile/ioext.h>
+#include <libguile/kw.h>
+#include <libguile/list.h>
+#include <libguile/load.h>
+#include <libguile/mallocs.h>
+#include <libguile/markers.h>
+#include <libguile/marksweep.h>
+#include <libguile/mbstrings.h>
+#include <libguile/numbers.h>
+#include <libguile/objprop.h>
+#include <libguile/options.h>
+#include <libguile/pairs.h>
+#include <libguile/params.h>
+#include <libguile/ports.h>
+#include <libguile/posix.h>
+#include <libguile/print.h>
+#include <libguile/procprop.h>
+#include <libguile/procs.h>
+#include <libguile/ramap.h>
+#include <libguile/read.h>
+#include <libguile/root.h>
+#include <libguile/scmsigs.h>
+#include <libguile/sequences.h>
+#include <libguile/simpos.h>
+#include <libguile/socket.h>
+#include <libguile/srcprop.h>
+#include <libguile/stackchk.h>
+#include <libguile/stime.h>
+#include <libguile/strings.h>
+#include <libguile/strop.h>
+#include <libguile/strorder.h>
+#include <libguile/strports.h>
+#include <libguile/struct.h>
+#include <libguile/symbols.h>
+#include <libguile/tag.h>
+#include <libguile/tags.h>
+#include <libguile/throw.h>
+#include <libguile/unif.h>
+#include <libguile/variable.h>
+#include <libguile/vectors.h>
+#include <libguile/version.h>
+#include <libguile/vports.h>
+#include <libguile/weaks.h>
 
 
 

libguile/list.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/markers.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/mbstrings.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 #include "symbols.h"
 
 

libguile/numbers.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/objprop.h

@@ -45,7 +45,7 @@
 
 
 #include <stdio.h>
-#include "_scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/options.h

@@ -47,7 +47,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/pairs.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/ports.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 #include "smob.h"
 
 

libguile/posix.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/print.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 extern scm_option scm_print_opts[];

libguile/procprop.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/procs.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/ramap.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/read.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/root.h

@@ -47,7 +47,7 @@
 
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/sequences.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/smob.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 #include "params.h"
 
 

libguile/socket.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/srcprop.h

@@ -47,7 +47,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/stackchk.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/stime.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 #ifdef __STDC__

libguile/strings.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/strop.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/strorder.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/strports.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 extern scm_ptobfuns scm_stptob;
 

libguile/struct.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/symbols.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 extern int scm_symhash_dim;

libguile/tag.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/throw.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/unif.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 typedef struct scm_array

libguile/variable.h

@@ -43,7 +43,7 @@
  * If you do not wish that, delete this exception notice.  
  */
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/vectors.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/version.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 
 

libguile/vports.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>
 
 extern scm_ptobfuns scm_sfptob;
 

libguile/weaks.h

@@ -44,7 +44,7 @@
  */
 
 
-#include "__scm.h"
+#include <libguile/__scm.h>