aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/Makefile25
-rwxr-xr-xrelease/release.sh2
2 files changed, 15 insertions, 12 deletions
diff --git a/include/Makefile b/include/Makefile
index 46b24f5db1f3..b102eeab82cd 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -56,16 +56,20 @@ LSUBDIRS= cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
-LSUBSUBDIRS= dev/mpt/mpilib
-
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+= netgraph/bluetooth/include
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
.endif
+LSUBSUBDIRS= dev/mpt/mpilib
+
.if ${MK_CUSE} != "no"
LSUBDIRS+= fs/cuse
.endif
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
+
.if ${MK_GSSAPI} != "no"
SUBDIR+= gssapi
INCS+= gssapi.h
@@ -75,18 +79,15 @@ INCS+= gssapi.h
INCS+= hesiod.h
.endif
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+= netgraph/bluetooth/include
+.endif
+
# Handle the #define aliases for libiconv
.if ${MK_ICONV} == "yes"
INCS+= iconv.h
.endif
-
-.if ${MK_USB} != "no"
-LSUBDIRS+= dev/usb
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram= dev/powermac_nvram
-.endif
+
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
diff --git a/release/release.sh b/release/release.sh
index 01a172771c88..6839e330f72a 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -39,6 +39,8 @@
PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
export PATH
+VERSION=2
+
# Prototypes that can be redefined per-chroot or per-target.
load_chroot_env() { }
load_target_env() { }