Fix install target logic

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

6 files changed, 25 insertions, 17 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 369905060..0cd55b4d8 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon May 22 10:24:49 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in	- (install) Always perform install actions using
+			  $(INSTALL_DATA).
+	* configure.in	- locate install program.
+
 Wed May  3 10:32:18 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* krb5.h: (krb5_auth_con_setports): Added missing prototype.
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index f7009cfbc..7999dad8d 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -33,10 +33,9 @@ clean-windows::
 	@echo Making clean locally
 
 KRB5_HEADERS = krb5.h k5-int.h
-install:: $(KRB5_HEADERS)
+
+install::
 	@set -x; for f in $(KRB5_HEADERS) ; \
-	do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/$$f; \
-	then true; else \
-		$(RM) $(DESTDIR)$(KRB5_INCDIR)/$$f; \
-		cp $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/$$f ; \
-	fi; done
+	do $(INSTALL_DATA) $(srcdir)$(S)$$f	\
+		$(DESTDIR)$(KRB5_INCDIR)$(S)$$f ; \
+	done
diff --git a/src/include/configure.in b/src/include/configure.in
index d24db212c..b3fb5a94f 100644
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -7,4 +7,5 @@ MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
 MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
+AC_PROG_INSTALL
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 1f23cca36..b0f9d15b7 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon May 22 09:41:39 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in	- (install) Always perform install actions using
+			  $(INSTALL_DATA).
+	* configure.in	- Locate install program.
+
 Sun May 21 15:25:45 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (PROCESS_REPLACE): Replace the RCTMPDIR in stock.h
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index dee7f567c..45c226503 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -36,19 +36,14 @@ clean::
 
 depend::
 
-install:: $(KRB5_HEADERS) osconf.h autoconf.h 
+install::
 	@set -x; for f in $(KRB5_HEADERS) ; \
-	do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \
-	then true; else \
-		$(RM) $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \
-		cp $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \
-	fi; done
+	do $(INSTALL_DATA) $(srcdir)$(S)$$f	\
+		$(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)$$f ; \
+	done
 	@set -x; for f in osconf.h autoconf.h $(ET_HEADERS); \
-	do if cmp -s $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \
-	then true; else \
-		$(RM) $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f; \
-		cp $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \
-	fi; done
+	do $(INSTALL_DATA) $(C)$$f $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)$$f; \
+	done
 
 PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
 		  -e "s+@KDB5DIR+$(KDB5DIR)+" \
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index e14e3e477..69ce4f580 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -158,4 +158,5 @@ else
 	AC_MSG_RESULT(Kerberos 4 compatibility enabled)
 	AC_DEFINE(KRB5_KRB4_COMPAT)
 fi
+AC_PROG_INSTALL
 V5_AC_OUTPUT_MAKEFILE