Commits

Anonymous committed 0866470

fixes for building the package.

  • Participants
  • Parent commits f455a71

Comments (0)

Files changed (5)

+2002-03-25  Daiki Ueno  <daiki@xemacs.org>
+
+	* Makefile (REQUIRES): Add fsf-compat and xemacs-base.
+	* Makefile (MULE_ELCS): Removed.
+	* Makefile (FLAGS): New.
+	* Makefile: Export both $(XEMACS) and $(FLAGS).
+
 2002-03-24  Daiki Ueno  <daiki@xemacs.org>
 
 	* INSTALL: Don't require FLIM.
 MAINTAINER = Daiki Ueno <ueno@unixuser.org>
 PACKAGE = liece
 PKG_TYPE = regular
-REQUIRES = apel mail-lib
+REQUIRES = apel mail-lib fsf-compat xemacs-base
 CATEGORY = standard
 
 ELCS = lisp/liece-xemacs.elc lisp/gettext.elc lisp/liece-clfns.elc \
 	lisp/liece-tcp.elc lisp/liece-url.elc lisp/liece-x-face.elc \
 	lisp/liece-window.elc lisp/liece.elc
 
-MULE_ELCS = lisp/liece-q-ccl.elc
+# MULE_ELCS = lisp/liece-q-ccl.elc
 
 DATA_1_FILES = $(wildcard etc/icons/*.xpm)
 DATA_1_DEST = $(PACKAGE)/icons
 
 include ../../XEmacs.rules
 
-GENERATED += lisp/custom-load.elc lisp/liece-setup.elc
+GENERATED += lisp/custom-load.elc
 
-all:: package lisp/liece-setup.elc $(DATA_3_FILES) $(INFO_FILES) \
-	$(AUTOLOAD_PATH)/auto-autoloads.elc $(AUTOLOAD_PATH)/custom-load.elc
+all:: $(AUTOLOAD_PATH)/auto-autoloads.elc $(AUTOLOAD_PATH)/custom-load.elc \
+	package $(DATA_3_FILES) $(INFO_FILES)
+
+export XEMACS FLAGS
+FLAGS = -batch $(VANILLA) -eval '(setq load-path (append (list $(patsubst %,"../../%",$(REQUIRES))) load-path))'
 
 package:
 	$(MAKE) -C lisp -f Makefile.lisp package

File lisp/ChangeLog

+2002-03-25  Daiki Ueno  <daiki@xemacs.org>
+
+	* Makefile.lisp (FLAGS): Don't set this if it is imported.
+
+	* liece-ctcp.el: Don't throw an error when liece-q-ccl is not found.
+
 2002-03-24  Daiki Ueno  <daiki@xemacs.org>
 
 	* liece-coding.el (liece-mime-charset-for-write): Use

File lisp/Makefile.lisp

 VERSION	= 1.4.7
 
 ifndef EMACS
-	EMACS	= emacs
+	EMACS = emacs
 endif
 ifndef XEMACS
-	XEMACS	= xemacs
+	XEMACS = xemacs
 endif
-FLAGS	= -batch -q -no-site-file
+ifndef FLAGS
+	FLAGS = -batch -q -no-site-file
+endif
+
 TAR	= tar
 
 PREFIX	= NONE

File lisp/liece-ctcp.el

 
 (require 'pccl)
 
-(if-broken ccl-usable
-    (require 'liece-q-el)
-  (require 'liece-q-ccl))
+(or (broken-p 'ccl-usable) (require 'liece-q-ccl nil 'noerror)
+    (require 'liece-q-el))
 
 (require 'liece-x-face)