Fix install target logic

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 369905060d7f154c8d402af010579e1d84fd48d0..0cd55b4d8aa3f7995bdbde89aab4ca828865a9a0 100644 (file)
--- 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 f7009cfbcafd647a86dd8f223bb27cdf1ab53671..7999dad8d4375178837e01a5dbfeef96bb5edd97 100644 (file)
--- 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 d24db212c437046bc8b7b4db88ff805e739e3c07..b3fb5a94fbb4fd2b5c6839c9c0b16384d58236cb 100644 (file)
--- 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 1f23cca36969dfe70b770d72a24db6c3ca74eda5..b0f9d15b7733ae5050833cf3e98da97cba297bd3 100644 (file)
--- 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 dee7f567c95aac92aeb1051bd6c0aa87439efeb0..45c226503a5f5297ffc33e9ce493bb61e38c20f4 100644 (file)
--- 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 e14e3e4776108cc38408fb308ade4bf65ee3bba5..69ce4f580f10f2e91d3c7aa43915079edd1610f4 100644 (file)
--- 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