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

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

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

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

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

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a5e3cd7..20c6f47 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>
+
+       * Makefile.am (glibconfig.h): Make sure `glibconfig.h' exists
+       after the rule is fired.
+       (install-exec-local): Install glibconfig.h only if the contents
+       are different from the currently installed glibconfig.h.
+
 1999-03-26  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (configexecincludedir): Rename from 

diff --git a/Makefile.am b/Makefile.am
index 3123850..bbcb360 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ AUTOMAKE_OPTIONS = 1.4
 
 SUBDIRS = . gmodule gthread docs tests
 
-configexecincludedir = $(pkglibdir)/include
-
 bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in
@@ -58,14 +56,21 @@ libglib_la_SOURCES = \
 include_HEADERS = \
        glib.h
 
-configexecinclude_DATA = \
-       glibconfig.h
+configexecincludedir = $(pkglibdir)/include
+#configexecinclude_DATA = glibconfig.h
+
+install-exec-local: glibconfig.h
+       $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
+       file=$(DESTDIR)$(configexecincludedir)/glibconfig.h; \
+       if test -r $$file && cmp -s glibconfig.h $$file; then :; \
+       else $(INSTALL_DATA) glibconfig.h $$file; fi
 
 configure: configure.in acglib.m4              
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
 glibconfig.h: stamp-gc-h
-       @:
+       @if test -f glibconfig.h; then :; \
+       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
        echo timestamp > stamp-gc-h

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 3123850..bbcb360 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -4,8 +4,6 @@ AUTOMAKE_OPTIONS = 1.4
 
 SUBDIRS = . gmodule gthread docs tests
 
-configexecincludedir = $(pkglibdir)/include
-
 bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in
@@ -58,14 +56,21 @@ libglib_la_SOURCES = \
 include_HEADERS = \
        glib.h
 
-configexecinclude_DATA = \
-       glibconfig.h
+configexecincludedir = $(pkglibdir)/include
+#configexecinclude_DATA = glibconfig.h
+
+install-exec-local: glibconfig.h
+       $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
+       file=$(DESTDIR)$(configexecincludedir)/glibconfig.h; \
+       if test -r $$file && cmp -s glibconfig.h $$file; then :; \
+       else $(INSTALL_DATA) glibconfig.h $$file; fi
 
 configure: configure.in acglib.m4              
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
 glibconfig.h: stamp-gc-h
-       @:
+       @if test -f glibconfig.h; then :; \
+       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
        echo timestamp > stamp-gc-h