summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2005-11-18 01:46:39 +0000
committerKen Raeburn <raeburn@mit.edu>2005-11-18 01:46:39 +0000
commit197a2fb6c808a388e7fd60b0aee453b820a54418 (patch)
tree038ce4309e4aac5c9dbf31b84556e889fb378465 /src
parentea0bce5c54ffe5cd181ec3a96b0924409e55edac (diff)
downloadkrb5-197a2fb6c808a388e7fd60b0aee453b820a54418.tar.gz
krb5-197a2fb6c808a388e7fd60b0aee453b820a54418.tar.xz
krb5-197a2fb6c808a388e7fd60b0aee453b820a54418.zip
* Makefile.in (osconf.h): Always remove osconf.new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17498 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/include/krb5/ChangeLog4
-rw-r--r--src/include/krb5/Makefile.in3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index dd597d629..dcce9d0a7 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (osconf.h): Always remove osconf.new.
+
2005-10-06 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (autoconf.stamp): When running config.status, only
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index b8d7d51fa..429b35515 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -56,7 +56,8 @@ OSCONFSRC = $(srcdir)/stock/osconf.h
osconf.h: $(OSCONFSRC) Makefile
cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
@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
+ else ($(RM) osconf.h ; $(CP) osconf.new osconf.h) fi
+ $(RM) osconf.new
##DOS##!endif
###############################################################################