Set the absolute path of timidity in timidity.el automatically

diff --git a/ChangeLog b/ChangeLog
index 55a9c66..9ecb0b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-06  TAMUKI Shoichi <tamuki@linet.gr.jp>
+
+       * interface/Makefile.am, interface/timidity.el,
+         interface/timidity.pel: Set the absolute path of timidity
+         in timidity.el automatically; add timidity.pel file to be
+         preprocessed, and remove timidity.el
+
 2011-12-05  Hans de Goede <hdegoede@redhat.com>
 
        * interface/tkmidity.ptcl, interface/tkpanel.tcl,

diff --git a/interface/Makefile.am b/interface/Makefile.am
index fb8d2ee..99cba26 100644 (file)
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -18,7 +18,7 @@
 
 include $(top_srcdir)/common.makefile.in
 
-SUFFIXES = .ptcl .tcl .@so@
+SUFFIXES = .ptcl .tcl .pel .el .@so@
 
 SUBDIRS = motif_bitmaps bitmaps pixmaps
 
@@ -239,11 +239,13 @@ EXTRA_DIST = \
        tkpanel.tcl \
        browser.tcl \
        misc.tcl \
-       timidity.el \
+       timidity.pel \
        tclIndex
 
 .ptcl.tcl:
        sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
+.pel.el:
+       sed -e 's@%BIN_DIR%@$(bindir)@g' $< > $@
 clean:
        rm -f tkmidity.tcl
        rm -f *.$(OBJEXT)

diff --git a/interface/Makefile.in b/interface/Makefile.in
index d934973..84b4ae2 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -334,7 +334,7 @@ DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\"
 DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\"
 BITMAP_DIR = $(TCL_DIR)/bitmaps
 
-SUFFIXES = .ptcl .tcl .@so@
+SUFFIXES = .ptcl .tcl .pel .el .@so@
 
 SUBDIRS = motif_bitmaps bitmaps pixmaps
 
@@ -500,7 +500,7 @@ EXTRA_DIST = \
        tkpanel.tcl \
        browser.tcl \
        misc.tcl \
-       timidity.el \
+       timidity.pel \
        tclIndex
 
 @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
@@ -678,7 +678,7 @@ SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_SOURCES)
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .ptcl .tcl .@so@ .$(so) .c .o .obj
+.SUFFIXES: .ptcl .tcl .pel .el .@so@ .$(so) .c .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/common.makefile.in $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  interface/Makefile
@@ -1077,6 +1077,8 @@ libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) $(libin
 
 .ptcl.tcl:
        sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
+.pel.el:
+       sed -e 's@%BIN_DIR%@$(bindir)@g' $< > $@
 clean:
        rm -f tkmidity.tcl
        rm -f *.$(OBJEXT)

diff --git a/interface/timidity.el b/interface/timidity.pel
similarity index 99%
rename from interface/timidity.el
rename to interface/timidity.pel
index f03ba25..564ec0e 100644 (file)
--- a/interface/timidity.el
+++ b/interface/timidity.pel
@@ -28,14 +28,14 @@
 ;;
 ;; You write follows in ~/.emacs
 ;; (autoload 'timidity "timidity" "TiMidity Interface" t)
-;; (setq timidity-prog-path "/usr/local/bin/timidity")
+;; (setq timidity-prog-path "%BIN_DIR%/timidity")
 ;;
 ;; Then you type:
 ;; M-x timidity
 
 ;; Configuration parameters.
 ; Absolute path of timidity.
-(defvar timidity-prog-path "/usr/local/bin/timidity")
+(defvar timidity-prog-path "%BIN_DIR%/timidity")
 
 ; String list for timidity program options.
 (defvar timidity-default-options nil)