* .cvsignore: Add `config.log', `config.status' and `sample.dot.emacs'.

* sample.dot.emacs.in: New file.
* acinclude.m4 (AM_PATH_LISPDIR): Set `pkgdatadir' if `--enable-package' option is specified.

diff --git a/.cvsignore b/.cvsignore
index 487de7a..a192146 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,6 @@ Makefile.in
 Makefile
 aclocal.m4
 configure
+config.log
+config.status
+sample.dot.emacs

diff --git a/Makefile.am b/Makefile.am
index 7547883..457eb05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
-SUBDIRS = . dcc doc etc lisp 
+SUBDIRS = . dcc doc etc lisp
+EXTRA_DIST = sample.dot.emacs.in
+DISTCLEANFILES = sample.dot.emacs
 
 CVSROOT = :pserver:anonymous@cvs.m17n.org:/cvs/root
 if USE_TM
@@ -33,6 +35,9 @@ endif
 
 all-local: $(ALL_LOCAL_TARGET)
 
+sample.dot.emacs: sample.dot.emacs.in
+       sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@
+
 install-data-local: $(INSTALL_LOCAL_TARGET) 
 
 clean-local: $(CLEAN_LOCAL_TARGET) 

diff --git a/acinclude.m4 b/acinclude.m4
index b0b8238..90be5b4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -72,8 +72,14 @@ AC_DEFUN(AM_PATH_LISPDIR,
     fi
     AC_MSG_RESULT($packagedir)
     AC_SUBST(packagedir)
+    pkgdatadir=${packagedir}/etc/${PACKAGE}
+    infodir=${packagedir}/info
     AM_CONDITIONAL(USE_CUSTOM_PACKAGEDIR, test x$ac_cv_packagedir = xyes)
   else 
     AC_MSG_RESULT(no)
   fi
+  AC_SUBST(icondir)
+  AC_SUBST(catalogdir)
+  AC_SUBST(styledir)
+  
   AM_CONDITIONAL(USE_PACKAGE, test x$enable_package = xyes)])

diff --git a/sample.dot.emacs.in b/sample.dot.emacs.in
new file mode 100644 (file)
index 0000000..991cc7e
--- /dev/null
+++ b/sample.dot.emacs.in
@@ -0,0 +1,5 @@
+;;; -*- emacs-lisp -*-
+
+(setq liece-intl-catalogue-directory "@pkgdatadir@/po"
+      liece-window-style-directory "@pkgdatadir@/styles"
+      liece-window-style-directory "@pkgdatadir@/icons")