Merge semi-1_10_2.

[elisp/semi.git] / Makefile

diff --git a/Makefile b/Makefile
index bbd8a86..32bebc7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,57 +3,47 @@
 #
 
 PACKAGE = semi
-VERSION = 1.8.2
+VERSION = 1.10.2
 
-SHELL  = /bin/sh
-MAKE   = make
-CC     = gcc
-CFLAGS = -O2
 TAR    = tar
 RM     = /bin/rm -f
 CP     = /bin/cp -p
-EMACS  = emacs
 
-GOMI   = *.elc
-FLAGS   = -batch -q -no-site-file
+EMACS  = emacs
+XEMACS = xemacs
+FLAGS   = -batch -q -no-site-file -l SEMI-MK
 
 PREFIX = NONE
 EXEC_PREFIX = NONE
 LISPDIR = NONE
+PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
-elc:
-       $(EMACS) $(FLAGS) -l SEMI-MK -f compile-semi \
-               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
-
-install-elc:   elc
-       $(EMACS) $(FLAGS) -l SEMI-MK -f install-semi \
-               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
-
+GOMI   = *.elc
 
-all:   $(UTILS) $(DVI) elc
 
-tex:   ol2
-       cd doc; $(MAKE) tex
+elc:
+       $(EMACS) $(FLAGS) -f compile-semi \
+               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
-dvi:   ol2
-       cd doc; $(MAKE) dvi
+install-elc:   elc
+       $(EMACS) $(FLAGS) -f install-semi \
+               $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
-ps:    ol2
-       cd doc; $(MAKE) ps
+install:       install-elc
 
 
-install:       install-elc
+package:
+       $(XEMACS) $(FLAGS) -f compile-semi-package $(PACKAGEDIR)
 
-update-xemacs:
-       $(EMACS) $(FLAGS) -l SEMI-MK -f update-xemacs-source
+install-package:       package
+       $(XEMACS) $(FLAGS) -f install-semi-package $(PACKAGEDIR)
 
 
 clean:
        -$(RM) $(GOMI)
-       -cd doc   && $(MAKE) clean
-       -cd gnus  && $(MAKE) clean
-       -cd mh-e  && $(MAKE) clean
-       cd ../mel && $(MAKE) clean
 
 
 tar:
@@ -68,4 +58,5 @@ tar:
        $(RM) /tmp/$(PACKAGE)-$(VERSION)/ftp.in
        cd /tmp; $(TAR) cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
        cd /tmp; $(RM) -r $(PACKAGE)-$(VERSION)
-       sed "s/VERSION/$(VERSION)/" < ftp.in > ftp
+       sed "s/VERSION/$(VERSION)/" < ftp.in \
+               | sed "s/PACKAGE/$(PACKAGE)/" > ftp