diff --git a/en_US.ISO8859-1/Makefile b/en_US.ISO8859-1/Makefile
index 6debd4bfa4..8754be5033 100644
--- a/en_US.ISO8859-1/Makefile
+++ b/en_US.ISO8859-1/Makefile
@@ -1,23 +1,22 @@
-#       $Id: Makefile,v 1.3 1999-08-19 20:35:53 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-26 19:42:10 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
 
 COMPAT_SYMLINK = en
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/en_US.ISO_8859-1			\
-		      ${DOCDIR}/${COMPAT_SYMLINK};			\
+		(cd ${DOCDIR} && ln -s en_US.ISO_8859-1 ${COMPAT_SYMLINK}); \
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX?= ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/Makefile b/en_US.ISO_8859-1/Makefile
index 6debd4bfa4..8754be5033 100644
--- a/en_US.ISO_8859-1/Makefile
+++ b/en_US.ISO_8859-1/Makefile
@@ -1,23 +1,22 @@
-#       $Id: Makefile,v 1.3 1999-08-19 20:35:53 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-26 19:42:10 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
 
 COMPAT_SYMLINK = en
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/en_US.ISO_8859-1			\
-		      ${DOCDIR}/${COMPAT_SYMLINK};			\
+		(cd ${DOCDIR} && ln -s en_US.ISO_8859-1 ${COMPAT_SYMLINK}); \
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX?= ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/es_ES.ISO8859-1/Makefile b/es_ES.ISO8859-1/Makefile
index ce65b21d12..3c72a04df6 100644
--- a/es_ES.ISO8859-1/Makefile
+++ b/es_ES.ISO8859-1/Makefile
@@ -1,22 +1,21 @@
-#       $Id: Makefile,v 1.4 1999-08-19 20:35:57 nik Exp $
+#       $Id: Makefile,v 1.5 1999-08-26 19:42:11 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/es_ES.ISO_8859-1 			\
-			${DOCDIR}/${COMPAT_SYMLINK}; 			\
+		(cd ${DOCDIR} && ln -s es_ES.ISO_8859-1 ${COMPAT_SYMLINK}); \
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX = ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/es_ES.ISO_8859-1/Makefile b/es_ES.ISO_8859-1/Makefile
index ce65b21d12..3c72a04df6 100644
--- a/es_ES.ISO_8859-1/Makefile
+++ b/es_ES.ISO_8859-1/Makefile
@@ -1,22 +1,21 @@
-#       $Id: Makefile,v 1.4 1999-08-19 20:35:57 nik Exp $
+#       $Id: Makefile,v 1.5 1999-08-26 19:42:11 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/es_ES.ISO_8859-1 			\
-			${DOCDIR}/${COMPAT_SYMLINK}; 			\
+		(cd ${DOCDIR} && ln -s es_ES.ISO_8859-1 ${COMPAT_SYMLINK}); \
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX = ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/ja_JP.eucJP/Makefile b/ja_JP.eucJP/Makefile
index 8eb19d78ff..1d977e142d 100644
--- a/ja_JP.eucJP/Makefile
+++ b/ja_JP.eucJP/Makefile
@@ -1,24 +1,23 @@
-#       $Id: Makefile,v 1.7 1999-08-19 20:35:58 nik Exp $
+#       $Id: Makefile,v 1.8 1999-08-26 19:42:11 nik Exp $
 
 SUBDIR = books
 SUBDIR+= man
 SUBDIR+= FAQ
 
 COMPAT_SYMLINK = ja_JP.eucJP
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/ja					\
-		      ${DOCDIR}/${COMPAT_SYMLINK};			\
+		(cd ${DOCDIR} && ln -s ja ${COMPAT_SYMLINK});		\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX = ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/ru_RU.KOI8-R/Makefile b/ru_RU.KOI8-R/Makefile
index 24ce20f2ba..20aa9a0164 100644
--- a/ru_RU.KOI8-R/Makefile
+++ b/ru_RU.KOI8-R/Makefile
@@ -1,29 +1,28 @@
-#       $Id: Makefile,v 1.3 1999-08-19 20:36:00 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-26 19:42:12 nik Exp $
 
 SUBDIR = FAQ
 
 COMPAT_SYMLINK = ru
 
 # 
 # XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
 # when the FAQ is DocBook'ed
 beforeinstall:
 	[ -d ${DOCDIR}/ru_SU.KOI8-R/books/faq ] || 			\
 		mkdir -p ${DOCDIR}/ru_SU.KOI8-R/books/faq
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/ru_SU.KOI8-R				\
-		      ${DOCDIR}/${COMPAT_SYMLINK};			\
+		(cd ${DOCDIR} && ln -s ru_RU.KOI8-R ${COMPAT_SYMLINK});	\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX = ..
 .include "../share/mk/docproj.docbook.mk"
diff --git a/zh_TW.Big5/Makefile b/zh_TW.Big5/Makefile
index 1874aba5e0..331ec2b7c9 100644
--- a/zh_TW.Big5/Makefile
+++ b/zh_TW.Big5/Makefile
@@ -1,22 +1,21 @@
-#       $Id: Makefile,v 1.3 1999-08-19 20:36:02 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-26 19:42:13 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = zh
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
 	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
 		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		ln -s ${DOCDIR}/zh_TW.Big5				\
-		      ${DOCDIR}/${COMPAT_SYMLINK};			\
+		(cd ${DOCDIR} && ln -s zh_TW.Big5 ${COMPAT_SYMLINK});	\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
 
 DOC_PREFIX = ..
 .include "../share/mk/docproj.docbook.mk"