--- ./BSDmakefile.orig	2008-02-27 18:28:25.000000000 +0200
+++ ./BSDmakefile	2010-03-10 20:21:40.736207982 +0200
@@ -16,8 +16,7 @@
 BINDIR?=	${PREFIX}/bin
 DATADIR?=	${PREFIX}/share/rospell
 DOCSDIR?=	${PREFIX}/share/doc/rospell
-X11BASE?=	/usr/X11R6
-QT_PREFIX?=	${X11BASE}
+QT_PREFIX?=	${LOCALBASE}
 
 CC?=	gcc
 CXX?=	g++
@@ -34,7 +33,7 @@
 .else
 QTCPPFLAGS+=	-DNO_DEBUG -DNO_QT_DEBUG -DUSING_QT3
 .endif
-QTCFGLIBS?=	-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg\
+QTCFGLIBS?=	-Wl,-export-dynamic -L${LOCALBASE}/lib -L${LOCALBASE}/lib -ljpeg\
 			-L${QT_PREFIX}/lib
 QTCFGLIBS+=	-lqt-mt -lXext -lX11 -lm ${PTHREAD_LIBS}
 
@@ -71,17 +70,23 @@
 locale.info misc.info signal.info string.info wchar.info time.info stdlib1.info stdlib2.info stdio1.info stdio2.info \
 stdio3.info usenix.sty usenix.tex \
 posixh1.info posixh2.info posixh3.info posixh4.info posixh5.info posixh6.info posixh7.info \
-posixh8.info posixh9.info posixh10.info posixh11.info HANDBOOK HANDBOOK-RO \
-rospell_ro.qm qt_ro.qm rospell.1
+posixh8.info posixh9.info posixh10.info posixh11.info rospell_ro.qm qt_ro.qm rospell.1
+PKG_DOC= HANDBOOK HANDBOOK-RO
+
 
 MANPREFIX?=	${PREFIX}
 MAN1=	rospell.1
 
-all: ${PROGS} ${PKG_DATA}
+all-bin: ${PROGS} ${PKG_DATA} 
+
+all-doc: ${PKG_DOC}
+
+all: all-bin all-doc
 
 dictfiles.h:
-	@${ECHO_CMD} "---> Configuring for PREFIX=${PREFIX}, DATADIR=${DATADIR} ... "
+	@${ECHO_CMD} "---> Configuring for PREFIX=${PREFIX}, DATADIR=${DATADIR}, DOCSDIR=${DOCSDIR} ... "
 	@${ECHO_CMD} "#define INSTALL_PLACE \"${DATADIR}/\"" > dictfiles.h
+	@${ECHO_CMD} "#define DOC_INSTALL_PLACE \"${DOCSDIR}/\"" >> dictfiles.h
 	@${ECHO_CMD} "#define ROSPELL_FREEBSD" >> dictfiles.h
 	@${ECHO_CMD} "---> Done dictfiles.h."
 
@@ -231,10 +236,7 @@
 HANDBOOK-RO:
 	cp src/help/handbook/HANDBOOK-RO HANDBOOK-RO
 
-
-
-install: all
-	@${ECHO_CMD} "---> Installing ... "
+install-bin: all-bin
 	@${ECHO_CMD} "----> Installing binary as ${BINDIR}/rospell ... "
 	@${BSD_INSTALL_PROGRAM} rospell ${BINDIR}/
 	@${ECHO_CMD} "----> Done."
@@ -291,17 +293,23 @@
 	@${BSD_INSTALL_DATA} posixh10.info ${DATADIR}
 	@${BSD_INSTALL_DATA} posixh11.info ${DATADIR}
 	@${BSD_INSTALL_DATA} src/freebsd/posixh.tags ${DATADIR}
-	@${BSD_INSTALL_DATA} HANDBOOK ${DATADIR}
 	@${ECHO_CMD} "----> Done."
 	@${ECHO_CMD} "----> Installing translation files in ${DATADIR} ... "
-	@${BSD_INSTALL_DATA} HANDBOOK-RO ${DATADIR}
 	@${BSD_INSTALL_DATA} rospell_ro.qm ${DATADIR}
 	@${BSD_INSTALL_DATA} qt_ro.qm ${DATADIR}
 	@${ECHO_CMD} "----> Done."
 	@${ECHO_CMD} "----> Installing man page ... "
 	@${BSD_INSTALL_MAN} rospell.1 ${MANPREFIX}/man/man1/rospell.1
 	@${ECHO_CMD} "----> Done."
-	@${ECHO_CMD} "---> Done installing."
+
+install-doc: all-doc
+	@${ECHO_CMD} "----> Installing documentation in ${DOCSDIR} ..."
+	@${MKDIR} ${DOCSDIR}
+	@${BSD_INSTALL_DATA} HANDBOOK ${DOCSDIR}
+	@${BSD_INSTALL_DATA} HANDBOOK-RO ${DOCSDIR}
+	@${ECHO_CMD} "----> Done."
+
+install: install-bin install-doc
 
 clean:
 	rm -f ${PROGS} ${PKG_DATA} 
@@ -313,4 +321,5 @@
 	@rm ${BINDIR}/rokloc
 	@rm ${MANPREFIX}/man/man1/rospell.1
 	@rm -Rf ${DATADIR}
+	@rm -Rf ${DOCSDIR}
 	@${ECHO_CMD} "---> Done."
