before creating links, check if pkg-config files exist for the default

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6ba3ec04a380e7003aeb78c1dc0b54cb543af13b..658560b29666bfd2b8f354abfabc3c3dc747f420 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos contrib
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
 SUBDIRS = po $(SRC_SUBDIRS) docs build
 
 # require automake 1.4
@@ -134,8 +134,13 @@ pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.
 DEFAULT_GDKTARGET=x11
 install-data-local:
        (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 \
@@ -149,10 +154,6 @@ dist-hook: gtk+.spec
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gtk-2.0.m4
 
-bin_SCRIPTS=gtk-config-2.0
-BUILT_SOURCES=gtk-config-2.0
-gtk-config-2.0: gtk-config-2.0.in
-
 .PHONY: files release sanity snapshot
 
 files: