diff options
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 c53c92bbfe..1cd6924059 100644 --- 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 1b8490091f..6371cdadcd 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 ############################################################################### |