[macemacsjp-cvs 225] CVS update: CarbonEmacsPackage

Back to archive index

Seiji Zenitani zenit****@users*****
2006年 1月 12日 (木) 20:36:05 JST


Index: CarbonEmacsPackage/Makefile
diff -u CarbonEmacsPackage/Makefile:1.23 CarbonEmacsPackage/Makefile:1.24
--- CarbonEmacsPackage/Makefile:1.23	Sun Jan  8 12:54:09 2006
+++ CarbonEmacsPackage/Makefile	Thu Jan 12 20:36:05 2006
@@ -8,7 +8,7 @@
 #  ネットワークインストール対応ライブラリも
 #  ほぼ同じ書式で記述しています。
 #
-#  $Id: Makefile,v 1.23 2006/01/08 03:54:09 zenitani Exp $
+#  $Id: Makefile,v 1.24 2006/01/12 11:36:05 zenitani Exp $
 #
 ###############################################################
 
@@ -19,9 +19,9 @@
 # OS_VERSION   : OS 毎にビルド方法を分ける(by 本庄さん)
 
 VERSION      = 22.0.50
-LONG_VERSION = January, 2006; Carbon Emacs Package (Test Build)
-#LONG_VERSION = January, 2006; Carbon Emacs Package (Compatible)
-#LONG_VERSION = January, 2006; Carbon Emacs Package by S. Zenitani et al.
+LONG_VERSION = February, 2006; Carbon Emacs Package (Test Build)
+#LONG_VERSION = February, 2006; Carbon Emacs Package (Compatible)
+#LONG_VERSION = February, 2006; Carbon Emacs Package by S. Zenitani et al.
 OS_VERSION   ?= Tiger
 #OS_VERSION   = Panther
 #OS_VERSION   = Leopard
@@ -94,7 +94,8 @@
 	CFLAGS=-DUSE_ATSUI \
 	./configure \
 		--prefix=/Applications/Emacs.app/Contents/Resources \
-		--with-carbon --without-x ; \
+		--with-carbon --without-x
+                --libexecdir=${PACKAGE_APP}/Contents/MacOS/libexec ; \
 	make bootstrap
 
 # Tiger 用、G4 最適化
@@ -103,7 +104,8 @@
 	CFLAGS="-DUSE_ATSUI -fast -mcpu=7450" \
 	./configure --enable-carbon-app=/Applications \
 		--prefix=/Applications/Emacs.app/Contents/Resources \
-		--with-carbon --without-x ; \
+		--with-carbon --without-x
+                --libexecdir=${PACKAGE_APP}/Contents/MacOS/libexec ; \
 	make bootstrap
 
 # Tiger 用、G5 最適化
@@ -113,7 +115,8 @@
 	CFLAGS="-DUSE_ATSUI -fast" \
 	./configure --enable-carbon-app=/Applications \
 		--prefix=/Applications/Emacs.app/Contents/Resources \
-		--with-carbon --without-x ; \
+		--with-carbon --without-x
+                --libexecdir=${PACKAGE_APP}/Contents/MacOS/libexec ; \
 	make bootstrap
 
 ###############################################################
@@ -132,7 +135,7 @@
 #	chmod 755 ${PACKAGE_PREFIX}/bin/emacs ${PACKAGE_PREFIX}/bin/emacs-${VERSION}
 #	see FAQ 1.10 <http://members.shaw.ca/akochoi-emacs/stories/faq.html>
 	mv ${PACKAGE_PREFIX}/bin ${PACKAGE_BIN}
-	mv ${PACKAGE_PREFIX}/libexec/emacs/${VERSION}/powerpc-* ${PACKAGE_APP}/Contents/MacOS/libexec
+#	mv ${PACKAGE_PREFIX}/libexec/emacs/${VERSION}/powerpc-* ${PACKAGE_APP}/Contents/MacOS/libexec
 	rm -rf ${PACKAGE_PREFIX}/libexec
 #	for d in etc leim lisp site-lisp ; do \
 #	       mv ${PACKAGE_PREFIX}/share/emacs/${VERSION}/$$d ${PACKAGE_PREFIX} ; \
@@ -545,12 +548,16 @@
 	chmod 755 ${PACKAGE_BIN}/activate
 	cp -p GPL/SmartActivate/activate.1 ${PACKAGE_PREFIX}/man/man1/
 
+# Coral
+_coral:
+	cp -pR GPL/Coral/coral.app ${PACKAGE_PREFIX}/../Library/
+
 
 # 追加 lisp パッケージを作成、インストールする部分
 # _skk => provided by net-installer
 # _migemo => temporally removed
 # _eb _eblook => 無理にリロケータブルにしない方が良い
-pkg: elisps mac-elisps _css-mode _wl _w3m _haskell _lookup _psgml _imaxima _mew _aspell-en _aspell-de session.el _ess _auctex _riece _howm _emacs-wiki _mmm-mode _nxml-mode _python-mode _slime _activate site-start.d
+pkg: elisps mac-elisps _css-mode _wl _w3m _haskell _lookup _psgml _imaxima _mew _aspell-en _aspell-de session.el _ess _auctex _riece _howm _emacs-wiki _mmm-mode _nxml-mode _python-mode _slime _activate _coral site-start.d
 	open ${PACKAGE_DIR}
 	@echo "make icon"
 	@echo "set background"


macemacsjp-cvs メーリングリストの案内
Back to archive index