summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/defaults/make.conf4
-rw-r--r--etc/make.conf4
-rw-r--r--gnu/usr.bin/perl/Makefile6
-rw-r--r--share/examples/etc/make.conf4
4 files changed, 14 insertions, 4 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index b067230..7036943 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.57 1998/03/18 07:58:49 jkh Exp $
+# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $
#
# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
# It allows you to override macro definitions to make without changing
@@ -20,6 +20,8 @@
#
# To avoid building the default system perl
#NOPERL= true
+# To avoid building the suid perl
+#NOSUIDPERL= true
#
# To have 'obj' symlinks created in your source directory
# (they aren't needed/necessary)
diff --git a/etc/make.conf b/etc/make.conf
index b067230..7036943 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.57 1998/03/18 07:58:49 jkh Exp $
+# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $
#
# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
# It allows you to override macro definitions to make without changing
@@ -20,6 +20,8 @@
#
# To avoid building the default system perl
#NOPERL= true
+# To avoid building the suid perl
+#NOSUIDPERL= true
#
# To have 'obj' symlinks created in your source directory
# (they aren't needed/necessary)
diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index 385033a..65c849d 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -4,7 +4,11 @@
# Note: I'm not sure what to do with c2ph located in misc...
#
-SUBDIR= perl tperl sperl usub lib x2p
+SUBDIR= perl tperl usub lib x2p
+
+.if !defined(NOSUIDPERL) && exists(${.CURDIR}/sperl)
+SUBDIR+=sperl
+.endif
.include <bsd.subdir.mk>
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index b067230..7036943 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.57 1998/03/18 07:58:49 jkh Exp $
+# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $
#
# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
# It allows you to override macro definitions to make without changing
@@ -20,6 +20,8 @@
#
# To avoid building the default system perl
#NOPERL= true
+# To avoid building the suid perl
+#NOSUIDPERL= true
#
# To have 'obj' symlinks created in your source directory
# (they aren't needed/necessary)
OpenPOWER on IntegriCloud