Author: yamakenz
Date: Sat Mar 29 06:01:47 2008
New Revision: 5360
Modified:
trunk/configure.ac
trunk/emacs/Makefile.am
trunk/emacs/uim-version.el.in
Log:
* This commit fix make distcheck failure by uim-version.el
* configure.ac
- Add emacs/uim-version.el to AC_CONFIG_FILES
* emacs/Makefile.am
- Remove uim-version.el generation workaround
* emacs/uim-version.el.in
- (uim-el-version): Replace @VERSION@ with @PACKAGE_VERSION@
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Mar 29 06:01:47 2008
@@ -1519,6 +1519,7 @@
xim/Makefile
fep/Makefile
emacs/Makefile
+ emacs/uim-version.el
test/Makefile
examples/Makefile
examples/uim-custom/Makefile
Modified: trunk/emacs/Makefile.am
==============================================================================
--- trunk/emacs/Makefile.am (original)
+++ trunk/emacs/Makefile.am Sat Mar 29 06:01:47 2008
@@ -27,9 +27,4 @@
uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
-if MAINTAINER_MODE
-uim-version.el: uim-version.el.in $(top_srcdir)/configure.ac
- sed -e 's/@\(VERSION\)@/$(VERSION)/' uim-version.el.in > $@
-endif
-
endif
Modified: trunk/emacs/uim-version.el.in
==============================================================================
--- trunk/emacs/uim-version.el.in (original)
+++ trunk/emacs/uim-version.el.in Sat Mar 29 06:01:47 2008
@@ -34,5 +34,5 @@
;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;
-(defconst uim-el-version "@VERSION@")
+(defconst uim-el-version "@PACKAGE_VERSION@")
(provide 'uim-version)