Make sure `gdkconfig.h' exists after the rule is fired.

* gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
after the rule is fired.
(install-exec-local): Install gdkconfig.h only if the contents are
different from the currently installed gdkconfig.h.

Rationale:
`make install-exec' is meant to install files that go into
$exec_prefix, which includes `gdkconfig.h'.  However, developers use
`make install-exec' when they know that none of the headers have
changed, to prevent needless recompiles of other packages.  My
previous change of installing `*config.h' during `make install-exec'
undermines this, even though it is the right thing to do.  So, in the
spirit of "do the right thing first, optimize later", here's the
optimization.

diff --git a/ChangeLog b/ChangeLog
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1e82f8e503002e53c7e498314f210cfeb11bd4e0..75d8e000201d8cebbc57dc980d300a715e7eddc0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1999-03-28  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gdk/Makefile.am (gdkconfig.h): Make sure `gdkconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install gdkconfig.h only if the contents are
+       different from the currently installed gdkconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gdk/Makefile.am (configexecincludedir): Rename from 

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index d5e5ae5a72cff765d2184ead1c8a7cc96d5b39cf..6bb478351d713e39bd61c031e53000f6d8f5063e 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -2,7 +2,7 @@
 
 gdkincludedir = $(includedir)/gdk
 
-configexecincludedir = $(pkglibdir)/include
+
 
 lib_LTLIBRARIES = libgdk.la
 
@@ -74,12 +74,18 @@ libgdk_la_LDFLAGS = \
          @x_libs@      \
          -lm
 
-configexecinclude_DATA = \
-       gdkconfig.h
+configexecincludedir = $(pkglibdir)/include
+#configexecinclude_DATA = gdkconfig.h
+install-exec-local: gdkconfig.h
+       $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
+       file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
+       if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
+       else $(INSTALL_DATA) gdkconfig.h $$file; fi
 
 BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
 gdkconfig.h: stamp-gc-h
-       @:
+       @if test -f gdkconfig.h; then :; \
+       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h