diff options
| -rwxr-xr-x | emacsen-common/install | 17 | ||||
| -rwxr-xr-x | emacsen-common/remove | 13 |
2 files changed, 12 insertions, 18 deletions
diff --git a/emacsen-common/install b/emacsen-common/install index 88ed6cf..fe59dcb 100755 --- a/emacsen-common/install +++ b/emacsen-common/install @@ -3,10 +3,7 @@ set -e -PACKAGE=$(basename $0) -VERSION=$(dpkg-query -Wf '${Version}' $PACKAGE) -UPSTREAM_VERSION=${VERSION%-*} -ELPA_PACKAGE=${PACKAGE#elpa-}-${UPSTREAM_VERSION} +ELPA_DIR=#ELPAPACKAGE#-#ELPAVERSION# FLAVOR=$1 case $FLAVOR in @@ -14,25 +11,25 @@ case $FLAVOR in exit 0 ;; emacs23*) - echo install/${ELPA_PACKAGE}: Skipping obsolete emacs ${FLAVOR} + echo install/${ELPA_DIR}: Skipping obsolete emacs ${FLAVOR} exit 0 ;; xemacs*) - echo install/${ELPA_PACKAGE}: Skipping unsupported emacs ${FLAVOR} + echo install/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOR} exit 0 ;; *) - echo install/${ELPA_PACKAGE}: Handling install of emacsen flavor ${FLAVOR} + echo install/${ELPA_DIR}: Handling install of emacsen flavor ${FLAVOR} esac src_dir=/usr/share/emacs/site-lisp/elpa-src -el_dir=$src_dir/${ELPA_PACKAGE}/ -elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_PACKAGE}/ +el_dir=$src_dir/${ELPA_DIR}/ +elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_DIR}/ export EMACSLOADPATH EMACSLOADPATH="/usr/share/emacs/site-lisp:" -echo install/${ELPA_PACKAGE}: byte-compiling for ${FLAVOR} +echo install/${ELPA_DIR}: byte-compiling for ${FLAVOR} [ -d ${elc_dir} ] || mkdir -p ${elc_dir} diff --git a/emacsen-common/remove b/emacsen-common/remove index 58021f9..dfa0df7 100755 --- a/emacsen-common/remove +++ b/emacsen-common/remove @@ -2,13 +2,10 @@ # /usr/lib/emacsen-common/packages/remove/foo set -e -PACKAGE=$DPKG_MAINTSCRIPT_PACKAGE -VERSION=$(dpkg-query -Wf '${Version}' $PACKAGE) -UPSTREAM_VERSION=${VERSION%-*} -ELPA_PACKAGE=${PACKAGE#elpa-}-${UPSTREAM_VERSION} +ELPA_DIR=#ELPAPACKAGE#-#ELPAVERSION# FLAVOR=$1 -elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_PACKAGE} +elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_DIR} FLAVOR=$1 case $FLAVOR in @@ -16,14 +13,14 @@ case $FLAVOR in exit 0 ;; emacs23) - echo remove/${ELPA_PACKAGE}: Skipping obsolete emacs ${FLAVOUR} + echo remove/${ELPA_DIR}: Skipping obsolete emacs ${FLAVOUR} exit 0 ;; xemacs*) - echo remove/${ELPA_PACKAGE}: Skipping unsupported emacs ${FLAVOUR} + echo remove/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOUR} ;; *) - echo remove/${ELPA_PACKAGE}: Handling removal of emacsen flavor ${FLAVOR} + echo remove/${ELPA_DIR}: Handling removal of emacsen flavor ${FLAVOR} esac echo dh-elpa: purging flavor specific files for ${FLAVOR} |