From ceaaad63495c7916ea62569e573c0b499b4a98d1 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 29 Jun 2005 23:29:38 +0000 Subject: [PATCH] * 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 --- src/include/krb5/ChangeLog | 6 ++++++ src/include/krb5/Makefile.in | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index c53c92bbf..1cd692405 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,9 @@ +2005-06-29 Ken Raeburn + + * 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 Novell merge. diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 1b8490091..6371cdadc 100644 --- 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 ############################################################################### -- 2.26.2