Package: ddskk
Version: 13.0.90.cvs20060531-1
Tags: patch

ddskk's emacsen-install script doesn't use the -no-site-file
option, so many startup files are loaded when install time,
that is redundantly and problematically.

Please use the -no-site-file option and set load-path appropriately.

--
Tatsuya Kinoshita
--- ddskk-13.0.90.cvs20060531-1/debian/emacsen-install
+++ ddskk-13.0.90.cvs20060531/debian/emacsen-install
@@ -19,12 +19,12 @@
 
 echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
 
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#    SITEFLAG="-no-site-file"
-#else
-#    SITEFLAG="--no-site-file"
-#fi
+FLAVORTEST=`echo $FLAVOR | cut -c-6`
+if [ ${FLAVORTEST} = xemacs ] ; then
+    SITEFLAG="-no-site-file"
+else
+    SITEFLAG="--no-site-file"
+fi
 FLAGS="${SITEFLAG} -q -batch -l path.el"
 
 ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
@@ -44,7 +44,10 @@
 cd ${ELCDIR}
 
 cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
+(setq APEL_SPECIFIC_LISPDIR "/usr/share/${FLAVOR}/site-lisp/apel")
+(setq load-path (cons APEL_SPECIFIC_LISPDIR load-path))
+(setq load-path (cons "${ELCDIR}/nicola" load-path))
+(setq load-path (cons "${ELCDIR}" load-path) byte-compile-warnings nil)
 EOF
 ${FLAVOR} ${FLAGS} -l SKK-MK -f SKK-MK-generate-autoloads-el >CompilationLog 
2>&1
 sed '/^;;; `load-path/,/^$/s/^/;/' skk-setup.el.in >skk-setup.el
@@ -52,6 +55,7 @@
 ${FLAVOR} ${FLAGS} -f batch-byte-compile skk-setup.el >>CompilationLog 2>&1
 ${FLAVOR} ${FLAGS} -l SKK-MK -f SKK-MK-compile NONE NONE NONE >>CompilationLog 
2>&1
 cd nicola
+mv ../path.el .
 ${FLAVOR} ${FLAGS} -l NICOLA-DDSKK-ELS -l NICOLA-DDSKK-MK -f 
nicola-ddskk-generate-autoloads >>../CompilationLog 2>&1
 ${FLAVOR} ${FLAGS} -f batch-byte-compile nicola-ddskk-autoloads.el 
>>../CompilationLog 2>&1
 ${FLAVOR} ${FLAGS} -l NICOLA-DDSKK-MK -f compile-nicola-ddskk NONE NONE NONE 
>>../CompilationLog 2>&1
diff -urN ddskk-13.0.90.cvs20060531-1/debian/emacsen-startup 
ddskk-13.0.90.cvs20060531/debian/emacsen-startup

Attachment: pgp6IEr1uqIl9.pgp
Description: PGP signature

Reply via email to