[src/netbsd-1-6]: src/distrib/utils/sysinst Pull up revision 1.17 (requested ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2da6c478f843
branches:  netbsd-1-6
changeset: 527780:2da6c478f843
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jun 06 09:58:04 2002 +0000

description:
Pull up revision 1.17 (requested by lukem in ticket #188):
- Replace make(1) and -D FTP_HOST with SYSINST_FTP_HOST.
  Defaults to "ftp.netbsd.org"
- Replace make(1) and -D FTP_DIR with SYSINST_FTP_DIR.
  Defaults to "pub/NetBSD/NetBSD-" + VER + "/" + MACH.
  (FTP_DIR used to override "pub/NetBSD/NetBSD-", which meant the
  path name had to contain the release version in it)
- Add make(1) and -D SYSINST_CDROM_DIR.
  Defaults to "/" + mach.
- only append ftp_prefix to ftp_dir and cdrom_dir once, just after
  the options are parsed.  Do this in newly added set_defaults().

diffstat:

 distrib/utils/sysinst/Makefile.inc |  21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 383d3ab2e5da -r 2da6c478f843 distrib/utils/sysinst/Makefile.inc
--- a/distrib/utils/sysinst/Makefile.inc        Thu Jun 06 08:41:51 2002 +0000
+++ b/distrib/utils/sysinst/Makefile.inc        Thu Jun 06 09:58:04 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.16 2002/04/29 04:40:00 sommerfeld Exp $
+#      $NetBSD: Makefile.inc,v 1.16.2.1 2002/06/06 09:58:04 lukem Exp $
 #
 # Makefile for install
 
@@ -17,14 +17,29 @@
 CPPFLAGS+=     -I. -I${.CURDIR}/../.. -I${.CURDIR} \
                -DREL=\"${VER}\" -DMACH=\"${MACHINE}\"
 
+
+# Host to ftp from.  Default:
+#      "ftp.netbsd.org"
+#
 .if defined(SYSINST_FTP_HOST)
-CPPFLAGS+=     -DFTP_HOST="${SYSINST_FTP_HOST}"
+CPPFLAGS+=     -DSYSINST_FTP_HOST=\"${SYSINST_FTP_HOST}\"
 .endif
 
+# Top-level ftp directory.  Default:
+#      "pub/NetBSD/NetBSD-" + VER + "/" + MACH
+#
 .if defined(SYSINST_FTP_DIR)
-CPPFLAGS+=     -DFTP_DIR="${SYSINST_FTP_DIR}"
+CPPFLAGS+=     -DSYSINST_FTP_DIR=\"${SYSINST_FTP_DIR}\"
 .endif
 
+# Top-level CDROM directory.  Default:
+#      "/" + MACH
+#
+.if defined(SYSINST_CDROM_DIR)
+CPPFLAGS+=     -DSYSINST_CDROM_DIR=\"${SYSINST_CDROM_DIR}\"
+.endif
+
+
 WARNS=         1
 
 CLEANFILES=    menu_defs.c menu_defs.h menus.def \