diff options
| -rw-r--r-- | Makefile.cvs | 1 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rwxr-xr-x | etc/psion.in | 52 |
3 files changed, 50 insertions, 18 deletions
diff --git a/Makefile.cvs b/Makefile.cvs index b7c3f10..8888b7f 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -32,6 +32,7 @@ $(LIBTOOLFILES): $(GETTEXT): $(ACLOCAL) echo n | gettextize -f + -test -f po/ChangeLog~ && mv -f po/ChangeLog~ po/ChangeLog $(AUTOMAKEFILES): $(ACLOCAL) $(CONFIGHIN) automake --add-missing diff --git a/configure.in b/configure.in index 6e579f4..d9b1edc 100644 --- a/configure.in +++ b/configure.in @@ -258,15 +258,24 @@ AC_ARG_ENABLE(kde, ) PLP_HELP_MSG([Options, only needed when building KDE2 stuff:]) if test "x$ac_enable_kde" = "xyes" ; then - kde_prefix=${prefix} - kde_exec_prefix=${exec_prefix} + if test "${prefix}" != "NONE" ; then + kde_prefix=${prefix} + else + kde_prefix=$ac_default_prefix + fi + if test "${exec_prefix}" != "NONE" ; then + kde_exec_prefix=${exec_prefix} + else + kde_exec_prefix=${kde_prefix} + fi AC_ARG_WITH(kdedir, - [ --with-kdedir=DIR specify KDE directory [$prefix]], + [ --with-kdedir=DIR specify KDE directory [\${prefix}]], [ kde_prefix=${withval} kde_exec_prefix=${withval} ] ) + AC_MSG_RESULT(KDE stuff will be installed below $kde_prefix) AC_SUBST(kde_prefix) AC_SUBST(kde_exec_prefix) AC_PATH_KDE diff --git a/etc/psion.in b/etc/psion.in index b10938c..eac7f62 100755 --- a/etc/psion.in +++ b/etc/psion.in @@ -18,42 +18,64 @@ if grep -qs ^/PLP/ /etc/mgetty+sendfax/login.config ; then test -n "$mrun" && MGETTY_HASPLP=true fi -# See how we were called. -case "$1" in - start) +start() { if $MGETTY_HASPLP ; then echo "NOT Starting ncpd because mgetty configured for PLP" exit 0 fi - echo -n "Starting Psion support: " + echo -n "Starting Psion support (ncpd): " daemon @prefix@/sbin/ncpd - daemon @prefix@/sbin/plpnfsd + RETVAL=$? echo - touch /var/lock/subsys/psion - ;; - stop) - echo -n "Shutting down Psion support: " + if [ $RETVAL -eq 0 ] ; then + echo -n "Starting Psion support (plpnfsd): " + daemon @prefix@/sbin/plpnfsd + RETVAL=$? + echo + fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/psion + return $RETVAL +} + +stop() { + echo -n "Stopping Psion support: " killproc plpnfsd -HUP while true ; do test -z "`pidofproc plpnfsd`" && break; sleep 1 # allow plpnfsd flushing it's cache done killproc ncpd + RETVAL=$? echo - rm -f /var/lock/subsys/psion + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/psion + return $RETVAL +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) ;; status) status plpnfsd status ncpd ;; - restart) - $0 stop - $0 start + restart|reload) + restart ;; + condrestart) + test -f /var/lock/subsys/psion && restart || : *) - echo "Usage: psion {start|stop|status|restart}" + echo "Usage: psion {start|stop|status|restart|reload|condrestart}" exit 1 esac -exit 0 +exit $? |