Linc parallel install fix [Was: Re: gdk-pixbuf stable parallel fixes]

["R.I.P. Deaddog" <maddog linuxhall org>]

On 8 Oct 2001, Havoc Pennington wrote:

> Trivial patch, I'll commit shortly if no objections.
>
> Index: configure.in
> ===================================================================
> RCS file: /cvs/gnome/gdk-pixbuf/configure.in,v
[......]

For another matter, can linc headers be moved too? For the reason,
see the output below:

[root mobile root]# linc-config --cflags
-I/usr/include
[root mobile root]# pkg-config --cflags linc
 -I/usr/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include

So it has an unexpected consequence of mis-including gnome 1.x
headers. libgnomeui2 fails to build along with gdk-pixbuf 0.x because
of this reason.

Attached a patch, can anybody have a look? Thanks a lot!

Abel

diff -ur linc-orig/include/linc/Makefile.am linc/include/linc/Makefile.am
--- linc-orig/include/linc/Makefile.am	Sun Aug 19 03:20:36 2001
+++ linc/include/linc/Makefile.am	Tue Oct  9 21:50:09 2001
@@ -1,4 +1,4 @@
-lincincludedir=$(includedir)/linc
+lincincludedir=$(includedir)/linc-1.0/linc
 
 lincinclude_HEADERS=\
 	linc-connection.h \
diff -ur linc-orig/linc-config.in linc/linc-config.in
--- linc-orig/linc-config.in	Mon Apr 30 06:00:46 2001
+++ linc/linc-config.in	Tue Oct  9 21:53:24 2001
@@ -3,7 +3,7 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 exec_prefix_set=no
-includedir= includedir@
+includedir= includedir@/linc-1.0
 libdir= libdir@
 
 usage()
diff -ur linc-orig/linc.pc.in linc/linc.pc.in
--- linc-orig/linc.pc.in	Tue Sep 25 17:31:09 2001
+++ linc/linc.pc.in	Tue Oct  9 21:53:06 2001
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@
+includedir= includedir@/linc-1.0
 
 Name: linc
 Description: ORBit2 network transport library
diff -ur linc-orig/linc.spec.in linc/linc.spec.in
--- linc-orig/linc.spec.in	Tue Sep 25 17:31:09 2001
+++ linc/linc.spec.in	Tue Oct  9 21:52:26 2001
@@ -69,7 +69,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/linc
+%{_includedir}/linc-1.0
 %{_datadir}/aclocal/*
 %{_bindir}/*