for the install: target, use cmp as a rough attempt for avoiding repeated

make install
from Simon Nicolussi
ok jsing tedu

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index d0d43b1..bb70776 100644 (file)
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.alpha,v 1.86 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.alpha,v 1.87 2015/01/13 01:12:48 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,8 +146,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 51bad80..c9dcb31 100644 (file)
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.amd64,v 1.64 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.amd64,v 1.65 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -150,8 +150,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index fae8726..ee71cf4 100644 (file)
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.armish,v 1.50 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.armish,v 1.51 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -157,8 +157,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index e908639..3b27b9d 100644 (file)
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.armv7,v 1.6 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.armv7,v 1.7 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -154,8 +154,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index e812e62..28ece52 100644 (file)
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.aviion,v 1.50 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.aviion,v 1.51 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,8 +151,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 4c135a7..846b4a0 100644 (file)
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.hppa,v 1.79 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.hppa,v 1.80 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -156,8 +156,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 5ef95b8..a93c8e0 100644 (file)
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.hppa64,v 1.51 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.hppa64,v 1.52 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -148,8 +148,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index d35ad07..21f1c14 100644 (file)
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.i386,v 1.91 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.i386,v 1.92 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -152,8 +152,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 7f91400..b1a53ac 100644 (file)
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.landisk,v 1.52 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.landisk,v 1.53 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,8 +146,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 4ff41c0..03b5d1b 100644 (file)
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.loongson,v 1.44 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.loongson,v 1.45 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -160,8 +160,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index e5550be..19ef165 100644 (file)
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.luna88k,v 1.58 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.luna88k,v 1.59 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,8 +151,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index aebfb73..920012b 100644 (file)
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.macppc,v 1.70 2015/01/11 19:25:13 tedu Exp $
+#      $OpenBSD: Makefile.macppc,v 1.71 2015/01/13 01:12:49 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,8 +146,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index 5605ba0..0a9c863 100644 (file)
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.octeon,v 1.20 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.octeon,v 1.21 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -160,8 +160,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index fcc4b14..a261032 100644 (file)
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.sgi,v 1.68 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.sgi,v 1.69 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -160,8 +160,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 5e5b793..b9406f4 100644 (file)
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.socppc,v 1.41 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.socppc,v 1.42 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,8 +146,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index d981c95..1607941 100644 (file)
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.solbourne,v 1.46 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.solbourne,v 1.47 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,8 +146,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index e649a3d..62216f4 100644 (file)
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.sparc,v 1.83 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.sparc,v 1.84 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -150,8 +150,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 94104fc..56bc973 100644 (file)
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.sparc64,v 1.71 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.sparc64,v 1.72 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,8 +147,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index d03940e..b6e3804 100644 (file)
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.vax,v 1.73 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.vax,v 1.74 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,8 +147,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif

diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index fcdf04f..3250068 100644 (file)
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.zaurus,v 1.53 2015/01/11 19:25:14 tedu Exp $
+#      $OpenBSD: Makefile.zaurus,v 1.54 2015/01/13 01:12:50 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -154,8 +154,7 @@ MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME}})
 install-kernel-${MACHINE_NAME}:
-       rm -f /obsd
-       ln /bsd /obsd
+       cmp -s bsd /bsd || ln -f /bsd /obsd
        cp bsd /nbsd
        mv /nbsd /bsd
 .endif