* Makefile.in (osconf.h): Depend on Makefile. Always display commands executed

for replace-if-newer sequence.
(PROCESS_REPLACE): Replace @MODULEDIR with $(KRB5_DB_MODULE_DIR).

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17277 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index c53c92bbfe39e044000681c941fd36f70d430aca..1cd6924059e16bbe93f6bc672463215f8af744e0 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-29  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (osconf.h): Depend on Makefile.  Always display
+       commands executed for replace-if-newer sequence.
+       (PROCESS_REPLACE): Replace @MODULEDIR with $(KRB5_DB_MODULE_DIR).
+
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
        Novell merge.

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 1b8490091fcfbdc89b73e0d60a3ee26d384586ed..6371cdadcd797ec7ae252bcf532f344725917b2c 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -49,15 +49,16 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
                  -e "s+@BINDIR+$(BINDIR)+" \
                  -e "s+@LIBDIR+$(LIBDIR)+" \
                  -e "s+@SBINDIR+$(SBINDIR)+" \
+                 -e "s+@MODULEDIR+$(KRB5_DB_MODULE_DIR)+" \
        -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
        -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' 
 
 OSCONFSRC = $(srcdir)/stock/osconf.h
 
-osconf.h: $(OSCONFSRC)
+osconf.h: $(OSCONFSRC) Makefile
        cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
-       @if cmp -s osconf.new osconf.h ; then :; \
-       else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi
+       @set -x ; if cmp -s osconf.new osconf.h ; then : osconf.h is current ; \
+       else ($(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi
 ##DOS##!endif
 ###############################################################################