emacs-jabber jabber-pkg.el.in, NONE, 1.1 configure.ac, 1.3, 1.4 Makefile.am, 1.3, 1.4

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3135

Modified Files:
	configure.ac Makefile.am 
Added Files:
	jabber-pkg.el.in 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-490
Creator:  Magnus Henoch <ma...@fr...>

_Really_ add jabber-pkg.el.in.  Don't distribute jabber-pkg.el in non-ELPA builds.


Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	24 Apr 2008 02:19:18 -0000	1.3
+++ configure.ac	25 Apr 2008 18:52:09 -0000	1.4
@@ -11,5 +11,5 @@
 AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno])
 AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno])
 
-AC_CONFIG_FILES([Makefile tests/Makefile jabber-pkg.el])
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	24 Apr 2008 02:19:18 -0000	1.3
+++ Makefile.am	25 Apr 2008 18:52:09 -0000	1.4
@@ -30,7 +30,7 @@
 dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
 MAINTAINERCLEANFILES=jabber-autoloads.el
 
-EXTRA_DIST = jabber-pkg.el
+EXTRA_DIST = jabber-pkg.el.in
 
 # The autoload file will cause Lisp sources to be rebuilt _twice_: the
 # timestamp of the Lisp compilation is set _before_ the autoloads are
@@ -48,11 +48,14 @@
 
 # Package everything in a form suitable for ELPA.  That is, use
 # "jabber" instead of "emacs-jabber" as base name.
+CLEANFILES = jabber-pkg.el
 elpa: dist
 	rm -rf emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
 	$(AMTAR) xzf emacs-jabber-$(PACKAGE_VERSION).tar.gz
 	mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
 	cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir
+	sed "s/@""PACKAGE_VERSION@""/$(PACKAGE_VERSION)/" < $(srcdir)/jabber-pkg.el.in > jabber-$(PACKAGE_VERSION)/jabber-pkg.el
 	$(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION)
 	rm -rf jabber-$(PACKAGE_VERSION)
 	@echo "Created jabber-$(PACKAGE_VERSION).tar"
+

--- NEW FILE: jabber-pkg.el.in ---
;; For ELPA: http://tromey.com/elpa/
(define-package "jabber" "@PACKAGE_VERSION@" "A Jabber client for Emacs.")

;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0