summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-09-17 09:32:22 +0000
committerjkh <jkh@FreeBSD.org>1999-09-17 09:32:22 +0000
commit3ef83ac32b16caeafde61e6be16369511aa2231d (patch)
tree4fa2fadab05e4a73ee4bbd6b244ac3066f8dcaa0 /release
parentbae502690e008a4ff0f04d687620a5f49efc97ad (diff)
downloadFreeBSD-src-3ef83ac32b16caeafde61e6be16369511aa2231d.zip
FreeBSD-src-3ef83ac32b16caeafde61e6be16369511aa2231d.tar.gz
MF3: various small tweaks.
Diffstat (limited to 'release')
-rw-r--r--release/Makefile4
-rw-r--r--release/sysinstall/config.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile
index 1e6c18f..a522dbd 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -430,12 +430,10 @@ release.7:
fi && shift && shift ; \
done
.endif
-.if exists(${RD}/dists/des)
- ( cd ${RD}/dists/src && \
+ ( test -d ${RD}/dists/des && cd ${RD}/dists/src && \
if [ -f ssecure.aa ] ; then mv ssecure.* ../des ; fi && \
if [ -f scrypto.aa ] ; then mv scrypto.* ../des ; fi && \
if [ -f skerbero.aa ] ; then mv skerbero.* ../des ; fi ; )
-.endif
@echo "src distribution is finished."
.endif
touch release.7
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 69078ff..3d52d0f 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -534,7 +534,7 @@ configXDesktop(dialogMenuItem *self)
}
}
else if (!strcmp(desk, "fvwm2")) {
- ret = package_add("fvwm2");
+ ret = package_add("fvwm");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
write_root_xprofile("xterm &\nexec fvwm2\n");
}
OpenPOWER on IntegriCloud