diff options
| -rw-r--r-- | release/Makefile | 4 | ||||
| -rw-r--r-- | release/sysinstall/config.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/config.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile index 1e6c18f320d2..a522dbddc671 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 69078ff18f5c..3d52d0f8b91a 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"); } diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 69078ff18f5c..3d52d0f8b91a 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/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"); } diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 69078ff18f5c..3d52d0f8b91a 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/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"); } |