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

2001-04-27  Sven Neumann  <sven@gimp.org>

	* Makefile.am: before creating links, check if pkg-config files
	exist for the default target. Otherwise link to the pkg-config files
	that got installed with this build.

diff --git a/ChangeLog b/ChangeLog
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 43d95167b04d83234ae1fbc8e33286b54d737b67..2923e3379ec585b44eae9253dfd836c7821367ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-04-27  Sven Neumann  <sven@gimp.org>
+
+       * Makefile.am: before creating links, check if pkg-config files
+       exist for the default target. Otherwise link to the pkg-config files
+       that got installed with this build.
+
 Thu Apr 26 19:11:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_motion): clean up column

diff --git a/Makefile.am b/Makefile.am
index 2f9eaa6090ec2977ea540e2b83987dccd2641664..658560b29666bfd2b8f354abfabc3c3dc747f420 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \