X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=053a4193fb923c5853c714a20e341df8bc7aa665;hb=aa76869a72cb47b89f9499ecfbf1f9b3de8bd83e;hp=8f55d2f97a767f517f2714740297baf94eae3b9f;hpb=1a6a620c3aa8cf32fd94168f06dd5c4529050755;p=chise%2Fchise-base.git

diff --git a/Makefile.in b/Makefile.in
index 8f55d2f..053a419 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@ LIBDIR		= @libdir@
 OPTS		= @ac_configure_args@
 CONCORD_OPTS	= $(OPTS)
 LIBCHISE_OPTS	= $(OPTS)
-XEMACS_OPTS	= $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+XEMACS_OPTS	= @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
 
 CVS_ROOT = @cvs_root@
 LEMI_CVS_ROOT = @lemi_cvs_root@
@@ -66,7 +66,7 @@ xemacs-chise/src/config.h:
 	cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:	config-xemacs
-	cd xemacs-chise && LANG=C make
+	cd xemacs-chise && LC_ALL=C make
 
 install-xemacs:	install-libchise $(BINDIR)/xemacs
 
@@ -75,8 +75,8 @@ $(BINDIR)/xemacs:	build-xemacs xemacs-chise/src/xemacs
 
 
 install-apel:	install-xemacs apel $(LIBDIR)/xemacs/xemacs-packages
-	$(SUDO) mkdir $(LIBDIR)/xemacs/site-packages
-	cd apel && LANG=C $(SUDO) make install-package
+	-$(SUDO) mkdir $(LIBDIR)/xemacs/site-packages
+	cd apel && LC_ALL=C $(SUDO) make install-package
 
 install-tomoyo-tools:	install-apel tomoyo-tools $(LIBDIR)/xemacs/mule-packages
 	cd tomoyo-tools && $(SUDO) make install
@@ -185,7 +185,7 @@ apel:
 $(LIBDIR)/xemacs/xemacs-packages:
 	cd $(LIBDIR)/xemacs && \
 	curl $(XEMACS_PACKAGES_URL)/xemacs-sumo.tar.gz \
-	| $(SUDO) $(TAR) xvzf -
+	| $(SUDO) $(TAR) xvzf - --exclude=apel
 
 $(LIBDIR)/xemacs/mule-packages:
 	cd $(LIBDIR)/xemacs && \