2 files changed, 34 insertions, 33 deletions

diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index c3098f6f5067..647d5ef027a3 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
-# $Id: Makefile,v 1.13 1999/01/18 03:05:25 steve Exp $
+# $Id: Makefile,v 1.14 1999/01/23 07:05:33 vanilla Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -38,7 +38,7 @@ INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd \
+CONFIGURE_ARGS=	\
 		--with-clash-detection \
 		--lockdir=/var/run/emacs/lock \
 		--with-x11 \
@@ -50,6 +50,7 @@ CONFIGURE_ARGS=	i386-unknown-freebsd \
 		--sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
 		--infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
 		${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 
 STRIP=
 
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index c50c3a16b872..d65f9461868d 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -11,34 +11,34 @@ bin/gnuattach
 bin/xemacs-20.4
 @exec ln -sf %D/%F %B/xemacs
 @unexec rm %B/xemacs
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/make-path
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/wakeup
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/profile
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/make-docfile
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/digest-doc
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/sorted-doc
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/movemail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/cvtmail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/fakemail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/yow
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/hexl
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/gnuserv
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/mmencode
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/rcs2log
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/vcdiff
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/gzip-el.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/install-sid
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/send-pr
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-au
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-file
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-html
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-image
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-mpeg
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-plain
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-ps
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tmdecode
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/add-little-package.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/add-big-package.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/DOC
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/config.values
-@dirrm lib/%%XEMACS_DIR%%/i386-unknown-freebsd
+lib/%%XEMACS_DIR%%/i386--freebsd/make-path
+lib/%%XEMACS_DIR%%/i386--freebsd/wakeup
+lib/%%XEMACS_DIR%%/i386--freebsd/profile
+lib/%%XEMACS_DIR%%/i386--freebsd/make-docfile
+lib/%%XEMACS_DIR%%/i386--freebsd/digest-doc
+lib/%%XEMACS_DIR%%/i386--freebsd/sorted-doc
+lib/%%XEMACS_DIR%%/i386--freebsd/movemail
+lib/%%XEMACS_DIR%%/i386--freebsd/cvtmail
+lib/%%XEMACS_DIR%%/i386--freebsd/fakemail
+lib/%%XEMACS_DIR%%/i386--freebsd/yow
+lib/%%XEMACS_DIR%%/i386--freebsd/hexl
+lib/%%XEMACS_DIR%%/i386--freebsd/gnuserv
+lib/%%XEMACS_DIR%%/i386--freebsd/mmencode
+lib/%%XEMACS_DIR%%/i386--freebsd/rcs2log
+lib/%%XEMACS_DIR%%/i386--freebsd/vcdiff
+lib/%%XEMACS_DIR%%/i386--freebsd/gzip-el.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/install-sid
+lib/%%XEMACS_DIR%%/i386--freebsd/send-pr
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-au
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-file
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-html
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-image
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-mpeg
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-plain
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-ps
+lib/%%XEMACS_DIR%%/i386--freebsd/tmdecode
+lib/%%XEMACS_DIR%%/i386--freebsd/add-little-package.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/add-big-package.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/DOC
+lib/%%XEMACS_DIR%%/i386--freebsd/config.values
+@dirrm lib/%%XEMACS_DIR%%/i386--freebsd