* etc/gnu-emacs-user-config.in: New file.

* etc/sample.dot.emacs.in: Removed.
* etc/Makefile.am: Generate gnu-emacs-user-config script.

diff --git a/etc/Makefile.am b/etc/Makefile.am
index ffb7083..5270e87 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS = icons po styles
 
-EXTRA_DIST = sample.dot.emacs.in
-DISTCLEANFILES = sample.dot.emacs
-pkgdata_DATA = sample.dot.emacs
-sample.dot.emacs: sample.dot.emacs.in
-       sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@
+EXTRA_DIST = gnu-emacs-user-config.in
+DISTCLEANFILES = gnu-emacs-user-config
+pkgdata_DATA = gnu-emacs-user-config
+gnu-emacs-user-config: gnu-emacs-user-config.in
+       sed 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@
+       chmod +x $@
 
 package:
 install-package: package

diff --git a/etc/gnu-emacs-user-config.in b/etc/gnu-emacs-user-config.in
new file mode 100644 (file)
index 0000000..6635cbf
--- /dev/null
+++ b/etc/gnu-emacs-user-config.in
@@ -0,0 +1,10 @@
+EMACS=${EMACS-emacs}
+
+custom=`cat <<'EOF'
+(custom-set-variables
+  '(liece-intl-catalogue-directory "@pkgdatadir@/locale" nil (liece))
+  '(liece-window-style-directory "@pkgdatadir@/styles" nil (liece))
+  '(liece-icon-directory "@pkgdatadir@/icons" nil (liece)))
+EOF`
+
+$EMACS -eval $custom -l cus-edit -l $< -f Custom-save

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