In install_* targets, honour any EXTRA_PACKAGES and EXTRA_ROOTSKELS
authorChris Pressey <cpressey@dragonflybsd.org>
Thu, 23 Dec 2004 04:39:57 +0000 (04:39 +0000)
committerChris Pressey <cpressey@dragonflybsd.org>
Thu, 23 Dec 2004 04:39:57 +0000 (04:39 +0000)
variable settings given on the make(1) command line.

Based-on-patch-by: Chuck Tuffli <chuck_tuffli at agilent dot com>
nrelease/Makefile

index 74a1b93..e671195 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.21 2004/12/20 21:13:09 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.22 2004/12/23 04:39:57 cpressey Exp $
 #
 
 ISODIR ?= /usr/release
@@ -52,8 +52,8 @@ INSTALLER_PKGS= libaura-1.0 libdfui-2.0 libinstaller-2.0 \
                thttpd-notimeout-2.24 dfuife_cgi-1.1
 INSTALLER_SKELS= installer
 
-INSTALLER_ENV= EXTRA_PACKAGES="${INSTALLER_PKGS}" \
-               EXTRA_ROOTSKELS="${INSTALLER_SKELS}"
+INSTALLER_ENV= EXTRA_PACKAGES="${INSTALLER_PKGS} ${EXTRA_PACKAGES}" \
+               EXTRA_ROOTSKELS="${INSTALLER_SKELS} ${EXTRA_ROOTSKELS}"
 
 installer_check:
                @${INSTALLER_ENV} ${MAKE} check