-Amélioré fonctions de download des packages

[hvlinux.git] / stage5 / pkg / emacs

diff --git a/stage5/pkg/emacs b/stage5/pkg/emacs
index 65038df..1593df7 100644 (file)
--- a/stage5/pkg/emacs
+++ b/stage5/pkg/emacs
@@ -1,34 +1,29 @@
-#!/bin/sh
-set -o errexit
-
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}-build
-../${1}/configure \
-    --prefix=/usr \
-    --libexecdir=/usr/sbin \
-    --with-x-toolkit=gtk
-make bootstrap
-make install
-ldconfig
-
-install -m644 ${SCRDIR}/resources/emacs/emacsrc /etc/skel/.emacs
-install -m644 ${SCRDIR}/resources/emacs/emacsrc /root/.emacs
-
-LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp
-
-install -v -m644 -d ${LOCAL_SITE_LIST}
-install -m644 ${SCRDIR}/resources/emacs/buffer-cycle.el ${LOCAL_SITE_LIST}
-
-# Set Emacs as default editor
-sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile
-
-exit $?
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS=" \
+        ${CONFIGURE_OPTS} \
+        --libexecdir=/usr/sbin \
+        --with-x-toolkit=gtk"
+}
+
+hvbuild()
+{
+    make bootstrap
+    make install
+}
+
+hvbuild_post()
+{
+    install -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs
+    install -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}
+
+    # Set Emacs as default editor
+    sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile
+}