From ff569068792eb736377297122b3bce75c3e55dc1 Mon Sep 17 00:00:00 2001
From: Arun Thomas <arun@minix3.org>
Date: Thu, 16 Feb 2012 23:26:38 +0100
Subject: [PATCH] Remove obsolete INSTALLFLAGS from makefiles

---
 drivers/log/Makefile    | 1 -
 drivers/memory/Makefile | 1 -
 drivers/tty/Makefile    | 1 -
 kernel/Makefile         | 1 -
 servers/devman/Makefile | 1 -
 servers/ds/Makefile     | 1 -
 servers/ext2/Makefile   | 1 -
 servers/init/Makefile   | 1 -
 servers/mfs/Makefile    | 1 -
 servers/pm/Makefile     | 1 -
 servers/rs/Makefile     | 1 -
 servers/sched/Makefile  | 1 -
 servers/vfs/Makefile    | 1 -
 servers/vm/Makefile     | 1 -
 share/mk/bsd.prog.mk    | 4 ++--
 15 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 7e27ba91e..87e9d256d 100644
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -8,6 +8,5 @@ LDADD+=	-lchardriver -lsys
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 32k
 
 .include <minix.bootprog.mk>
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index c92c485b9..494f105c3 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -8,7 +8,6 @@ LDADD+=	-lblockdriver -lchardriver -lsys
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 8k
 
 CPPFLAGS.memory.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.imgrd.c+=	-I${.CURDIR}/../ramdisk 
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 42e74f97e..8a2aec399 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -9,7 +9,6 @@ LDADD+=	-lsys -ltimers
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 16k
 
 SUBDIR= keymaps
 
diff --git a/kernel/Makefile b/kernel/Makefile
index 5a97844f7..071e12f79 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -32,7 +32,6 @@ DPADD+=	${LIBC}
 
 CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
 
-INSTALLFLAGS+=	-S 0
 BINDIR=	/usr/sbin
 MAN=
 
diff --git a/servers/devman/Makefile b/servers/devman/Makefile
index c854b1e91..80c26043c 100644
--- a/servers/devman/Makefile
+++ b/servers/devman/Makefile
@@ -6,7 +6,6 @@ SRCS =  main.c device.c buf.c bind.c
 DPADD+=	${LIBSYS}
 LDADD =  -lvtreefs -lsys
 BINDIR?= /sbin
-INSTALLFLAGS+=	-S 128k
 
 MAN=
 .include <minix.service.mk>
diff --git a/servers/ds/Makefile b/servers/ds/Makefile
index f59486e5a..a7449af03 100644
--- a/servers/ds/Makefile
+++ b/servers/ds/Makefile
@@ -8,6 +8,5 @@ LDADD+=	-lsys
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 16k
 
 .include <minix.bootprog.mk>
diff --git a/servers/ext2/Makefile b/servers/ext2/Makefile
index a55c47a5f..31aa46186 100644
--- a/servers/ext2/Makefile
+++ b/servers/ext2/Makefile
@@ -11,6 +11,5 @@ LDADD+= -lminixfs -lbdev -lsys
 MAN=
 
 BINDIR?= /sbin
-INSTALLFLAGS+= -S 128k
 
 .include <minix.service.mk>
diff --git a/servers/init/Makefile b/servers/init/Makefile
index d8c2a4c95..71b807834 100644
--- a/servers/init/Makefile
+++ b/servers/init/Makefile
@@ -7,7 +7,6 @@ SRCS=	init.c
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 64k
 
 LDFLAGS+= -Wl,--section-start=.init=0x0
 
diff --git a/servers/mfs/Makefile b/servers/mfs/Makefile
index d2216da54..c9fec9dc8 100644
--- a/servers/mfs/Makefile
+++ b/servers/mfs/Makefile
@@ -11,7 +11,6 @@ LDADD+= -lminixfs -lbdev -lsys
 MAN=
 
 BINDIR?= /sbin
-INSTALLFLAGS+=	-S 128k
 
 DEFAULT_NR_BUFS= 1024
 CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}
diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index d4ac76906..edc4f225b 100644
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -22,7 +22,6 @@ LDADD+=	-lsys -ltimers
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 32k
 
 CPPFLAGS.main.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.misc.c+=	-I${MINIXSRCDIR}
diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index 6a2e28374..2ea097821 100644
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -8,7 +8,6 @@ LDADD+=	-lsys -lexec
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 8125k
 
 CPPFLAGS+=	-I${MINIXSRCDIR}
 
diff --git a/servers/sched/Makefile b/servers/sched/Makefile
index 7d7afc980..b199099e8 100644
--- a/servers/sched/Makefile
+++ b/servers/sched/Makefile
@@ -8,7 +8,6 @@ LDADD+=	-lsys -ltimers
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 32k
 
 CPPFLAGS.main.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.schedule.c+=	-I${MINIXSRCDIR}
diff --git a/servers/vfs/Makefile b/servers/vfs/Makefile
index b7bdd8f10..e94608c5c 100644
--- a/servers/vfs/Makefile
+++ b/servers/vfs/Makefile
@@ -22,6 +22,5 @@ LDADD+=	-lc
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 16k
 
 .include <minix.bootprog.mk>
diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index f17b3929e..f4db0becc 100644
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -12,7 +12,6 @@ LDADD+=	-lsys
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 128k
 
 CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}
 CPPFLAGS+=	-I${MINIXSRCDIR}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index ba5e23004..ff069fae1 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -95,12 +95,12 @@ CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
 __proginstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${INSTALLFLAGS} ${STRIPFLAG} ${.ALLSRC} ${.TARGET}
+		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
 
 __progdebuginstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
-		${INSTALLFLAGS} ${.ALLSRC} ${.TARGET}
+		${.ALLSRC} ${.TARGET}