summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/Makefile4
-rw-r--r--usr.sbin/sade/main.c3
-rw-r--r--usr.sbin/sysinstall/Makefile4
-rw-r--r--usr.sbin/sysinstall/main.c3
4 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index d4b3e13..1b2762e 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -18,7 +18,9 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
-#CFLAGS+= -DLOAD_CONFIG_FILE=\"install.cfg\"
+.if defined(LOAD_CONFIG_FILE)
+CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
+.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index fcf9b52..a207fb1 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -113,8 +113,7 @@ main(int argc, char **argv)
if (argc > start_arg)
systemShutdown(0);
}
-
- {
+ else {
FILE *fp;
char buf[BUFSIZ];
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index d4b3e13..1b2762e 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -18,7 +18,9 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
-#CFLAGS+= -DLOAD_CONFIG_FILE=\"install.cfg\"
+.if defined(LOAD_CONFIG_FILE)
+CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
+.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index fcf9b52..a207fb1 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -113,8 +113,7 @@ main(int argc, char **argv)
if (argc > start_arg)
systemShutdown(0);
}
-
- {
+ else {
FILE *fp;
char buf[BUFSIZ];
OpenPOWER on IntegriCloud