X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Femacs;h=265ba661995e76c63c24aacc37e7653b75d003eb;hb=3a7d016a0246156de63a6f98bbf5be2e95230060;hp=1593df7d406dacb404680e6c910b6e0595df6823;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage5/pkg/emacs b/stage5/pkg/emacs
index 1593df7..265ba66 100644
--- a/stage5/pkg/emacs
+++ b/stage5/pkg/emacs
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/sbin \
         --with-x-toolkit=gtk"
 }
@@ -16,13 +15,12 @@ hvbuild()
 
 hvbuild_post()
 {
-    install -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs
-    install -m644 ${SCRDIR}/misc/emacs/emacsrc /root/.emacs
+    install -v -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs
+    install -v -m644 ${SCRDIR}/misc/emacs/emacsrc /root/.emacs
 
-    LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp
-
-    install -v -m644 -d ${LOCAL_SITE_LIST}
-    install -m644 ${SCRDIR}/misc/emacs/buffer-cycle.el ${LOCAL_SITE_LIST}
+    install -v -m755 -d ${EMACS_LOCAL_SITE_LISP}
+    install -v -m644 ${SCRDIR}/misc/emacs/php-mode.el \
+        ${EMACS_LOCAL_SITE_LISP}
 
     # Set Emacs as default editor
     sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile