Re: symlink gdk-2.0.pc and gtk+-2.0.pc to default target

[Sven Neumann <sven gimp org>]

Hi,

Havoc Pennington <hp redhat com> writes:
> Sven Neumann <sven gimp org> writes:
> > Is there a special reason we don't use the GDKTARGET that was specified
> > at configure time, but introduce a hardcoded X11 default target here? 
> > IMO this is useless, since the user wants his gtk+-2.0.pc file to point
> > to the version that is installed, not a hardcoded X11 target that might 
> > not even be available.
> > 
> "gtk+-2.0" should always refer to the same thing; we have defined it
> to mean "the standard backend for the platform" which is either X or
> win32. Apps that request "gtk+-2.0" are general-purpose desktop apps.

Agreed, but we should apply the included patch to Makefile.am which 
checks if the default target is available and links to the built target
otherwise instead of trying to create dead links. Can I commit?


Salut, Sven

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- Makefile.am	2001/04/03 18:48:32	1.48
+++ Makefile.am	2001/04/26 21:57:18
@@ -133,9 +133,14 @@
 ## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
 DEFAULT_GDKTARGET=x11
 install-data-local:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 test -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -e gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
 	 $(LN_S) -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-         $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc)
+         $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 $(LN_S) -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+         $(LN_S) -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
 dist-hook: gtk+.spec
 	if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \