Permalink
Browse files

Move mk/emacs.mk to editors/emacs/modules.mk.

Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users.  Be DEPENDS to it.  This should
address pkg/37146 by Aleksey Cheusov.

While here convert some emacs lisp packages to user-destdir.
  • Loading branch information...
1 parent 3f1771b commit 0abaefcd285e7a8d06fc3885790bac5c12c2bb68 uebayasi committed Oct 11, 2008
Showing with 758 additions and 657 deletions.
  1. +2 −2 cad/dinotrace-mode/Makefile
  2. +2 −2 cad/verilog-mode/Makefile
  3. +12 −2 chat/irchat-pj/Makefile
  4. +2 −2 chat/navi2ch/Makefile
  5. +16 −3 chat/riece/Makefile
  6. +3 −3 chat/zenicb/Makefile
  7. +5 −3 chat/zenirc/Makefile
  8. +2 −2 chat/zephyr-mode/Makefile
  9. +20 −3 devel/apel/Makefile
  10. +2 −2 devel/apel/buildlink3.mk
  11. +2 −2 devel/cflow-mode/Makefile
  12. +2 −2 devel/cmake-mode/Makefile
  13. +2 −2 devel/cqual/Makefile
  14. +4 −2 devel/doxymacs/Makefile
  15. +2 −2 devel/elib/Makefile.common
  16. +2 −2 devel/emacs-ilisp/Makefile
  17. +16 −3 devel/flim/Makefile
  18. +4 −4 devel/haskell-mode/Makefile
  19. +2 −2 devel/js2-mode/Makefile
  20. +2 −2 devel/mell/Makefile
  21. +2 −2 devel/mell/buildlink3.mk
  22. +5 −3 devel/pcl-cvs/Makefile
  23. +2 −2 devel/php-mode/Makefile
  24. +2 −2 devel/psvn/Makefile
  25. +2 −2 devel/pvs/Makefile
  26. +2 −2 devel/python-mode/Makefile
  27. +2 −2 devel/rsltc/Makefile
  28. +2 −2 devel/ruby-mode/Makefile
  29. +2 −2 devel/ruby-rd-mode/Makefile
  30. +2 −2 devel/scmgit-base/Makefile
  31. +2 −2 devel/semantic/Makefile
  32. +16 −3 devel/semi/Makefile
  33. +2 −2 devel/sml-mode/Makefile
  34. +4 −4 editors/emacs-nox11/buildlink3.mk
  35. +9 −0 editors/emacs-nox11/version.mk
  36. +2 −2 editors/emacs-packages/Makefile
  37. +4 −4 editors/emacs/buildlink3.mk
  38. +317 −0 editors/emacs/modules.mk
  39. +9 −0 editors/emacs/version.mk
  40. +4 −4 editors/emacs20/buildlink3.mk
  41. +9 −0 editors/emacs20/version.mk
  42. +4 −4 editors/emacs21-nox11/buildlink3.mk
  43. +9 −0 editors/emacs21-nox11/version.mk
  44. +4 −4 editors/emacs21/buildlink3.mk
  45. +9 −0 editors/emacs21/version.mk
  46. +2 −2 editors/gnuserv/Makefile
  47. +2 −2 editors/jde/Makefile
  48. +2 −2 editors/leim21/Makefile
  49. +2 −2 editors/matlab-mode/Makefile
  50. +6 −6 editors/mule-ucs/Makefile
  51. +2 −2 editors/mule-ucs/buildlink3.mk
  52. +2 −2 editors/speedbar/Makefile
  53. +5 −2 editors/tamago/Makefile
  54. +4 −4 editors/xemacs-current-nox11/buildlink3.mk
  55. +9 −0 editors/xemacs-current-nox11/version.mk
  56. +4 −4 editors/xemacs-current/buildlink3.mk
  57. +9 −0 editors/xemacs-current/version.mk
  58. +4 −4 editors/xemacs-nox11/buildlink3.mk
  59. +9 −0 editors/xemacs-nox11/version.mk
  60. +4 −4 editors/xemacs/buildlink3.mk
  61. +9 −0 editors/xemacs/version.mk
  62. +10 −9 graphics/artist/Makefile
  63. +2 −2 inputmethod/anthy-elisp/Makefile
  64. +2 −2 inputmethod/iiimecf/Makefile
  65. +2 −2 inputmethod/prime-el/Makefile
  66. +8 −11 inputmethod/skk/Makefile
  67. +12 −7 inputmethod/skk/files/SKK-CFG
  68. +2 −2 inputmethod/tc/Makefile
  69. +2 −2 lang/eieio/Makefile
  70. +2 −2 lang/twelf/Makefile
  71. +2 −2 mail/etach/Makefile
  72. +2 −2 mail/gnus/Makefile
  73. +7 −3 mail/mailcrypt/Makefile
  74. +11 −7 mail/mew/Makefile
  75. +2 −2 mail/rmail-mime/Makefile
  76. +2 −2 mail/vm/Makefile
  77. +14 −14 mail/wl/Makefile
  78. +2 −2 math/calc/Makefile
  79. +2 −2 math/ess/Makefile
  80. +2 −2 misc/bbdb/Makefile
  81. +2 −2 misc/bbdb/buildlink3.mk
  82. +2 −2 misc/elscreen/Makefile
  83. +2 −2 misc/emacs-wiki/Makefile
  84. +2 −2 misc/lookup/Makefile
  85. +3 −398 mk/emacs.mk
  86. +4 −2 print/auctex/Makefile
  87. +2 −2 security/EasyPG/Makefile
  88. +2 −2 security/starttls/Makefile
  89. +2 −2 textproc/dictem/Makefile
  90. +6 −4 textproc/emacs-dict-client/Makefile
  91. +2 −2 textproc/emacs-muse/Makefile
  92. +6 −4 textproc/flyspell/Makefile
  93. +6 −4 textproc/ispell-emacs/Makefile
  94. +2 −2 textproc/migemo-elisp/Makefile
  95. +2 −2 textproc/nxml-mode/Makefile
  96. +2 −2 textproc/psgml-mode/Makefile
  97. +2 −2 textproc/suikyo-elisp/Makefile
  98. +2 −2 textproc/suikyo/Makefile
  99. +2 −2 textproc/xslide/Makefile
  100. +9 −5 www/emacs-w3m/Makefile
  101. +2 −2 www/w3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= dinotrace-9.3c
@@ -16,7 +16,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
EMACS= emacs
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= verilog-mode-3.60
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
EMACS= emacs
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/19 08:52:10 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= irchat-pj-2.4.24.22
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,10 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://gouketsu.net/irchat-pj/
COMMENT= Emacs lisp interface to Internet Relay Chat
-.include "../../mk/emacs.mk"
+INSTALLATION_DIRS= bin ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/irchat-pj
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
INSTALL_TARGET= install
@@ -26,4 +29,11 @@ PKG_FAIL_REASON+= "Unknown Emacs flavor"
LIBS.SunOS+= -lnsl -lsocket
MAKE_ENV+= LIBS=${LIBS:M*:Q}
+do-install:
+ cd ${WRKSRC}; \
+ ${INSTALL_PROGRAM} dcc/dcc ${DESTDIR}${PREFIX}/bin; \
+ for f in irchat*.el*; do \
+ ${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/irchat-pj; \
+ done
+
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/07/14 12:56:00 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= navi2ch-cvs_0.0.20070423-1
PKGNAME= ${EMACS_PKGNAME_PREFIX}navi2ch-1.7.5.99.20070423
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+=${CONFIGURE_ARGS.${EMACS_FLAVOR}}
CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX}/navi2ch
CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/10/06 07:24:31 uebayasi Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= riece-5.0.0
@@ -10,14 +10,18 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://www.nongnu.org/riece/
COMMENT= IRC client for Emacs
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/riece \
+ ${EMACS_INFOPREFIX:C|^${PREFIX}/||}
+
EMACS_VERSIONS_ACCEPTED= \
emacs22 emacs22nox emacs21 emacs21nox xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_MODULES= base
WRKSRC= ${WRKDIR}/${DISTNAME:C|[^0-9]$||}
GNU_CONFIGURE= YES
INFO_FILES= # PLIST
-EMACS_MODULES= base
# --with-emacs=... or --with-xemacs=...
CONFIGURE_ARGS+= --with-${EMACS_FLAVOR}=${EMACS_BIN:Q}
@@ -27,6 +31,15 @@ CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX:Q}
CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
-.include "../../mk/emacs.mk"
+do-install: plist
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.info ${DESTDIR}${EMACS_INFOPREFIX}
+ cd ${WRKSRC}/lisp; \
+ grep -v '^@' ${PLIST} | grep '/site-lisp/riece/' | \
+ while read file; do \
+ file=$$( basename $$file ); \
+ ${INSTALL_DATA} $$file ${DESTDIR}${EMACS_LISPPREFIX}/riece; \
+ done
+
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= zenicb-19981202
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,10 +10,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= ICB client for Emacs
PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/zenicb
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
@@ -22,7 +23,6 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
do-build:
do-install:
- @${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zenicb
@for file in ${WRKSRC}/src/*.el; do \
j="${INSTALL_DATA} $$file ${DESTDIR}${EMACS_LISPPREFIX}/zenicb"; \
${ECHO} $$j; $$j; \
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:26 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= zenirc-2.112
@@ -11,14 +11,16 @@ MAINTAINER= thorpej@NetBSD.org
HOMEPAGE= http://www.splode.com/~friedman/software/emacs-lisp/zenirc/
COMMENT= IRC client for Emacs
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= YES
CONFIGURE_HAS_MANDIR= NO
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "xemacs"
MAKE_FLAGS+= EMACS=xemacs
.endif
-MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/zenirc
+MAKE_FLAGS+= elispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}/zenirc
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= zephyr-mode-2.5.20
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
do-install:
@${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zephyr-mode
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/29 12:53:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= apel-10.7
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,14 +10,18 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
COMMENT= Portable Emacs library
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= ${DOCDIR} \
+ ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \
+ ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu
+
PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR}
BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}}
INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}}
-INSTALLATION_DIRS+= ${DOCDIR}
# apel is included in xemacs-packages
EMACS_VERSIONS_ACCEPTED=emacs22 emacs22nox emacs21 emacs21nox emacs20
@@ -29,5 +33,18 @@ INSTALL_TARGET.xemacs= install-package
MAKE_FLAGS.emacs=
MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
-.include "../../mk/emacs.mk"
+# Pkgsrc developers should run "install" without this and check if PLIST is
+# correct. Users just need to install files.
+do-install: plist
+ cd ${WRKSRC}; \
+ for subdir in emu apel; do \
+ grep -v '^@' ${PLIST} | grep "/site-lisp/$$subdir/" | \
+ while read file; do \
+ file=$$( basename $$file ); \
+ ${INSTALL_DATA} $$file \
+ ${DESTDIR}${EMACS_LISPPREFIX}/$$subdir/$$file; \
+ done \
+ done
+
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:16 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APEL_BUILDLINK3_MK:= ${APEL_BUILDLINK3_MK}+
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
.if ${BUILDLINK_DEPTH} == "+"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= cflow-1.1
PKGNAME= cflow-mode-1.1
@@ -11,7 +11,7 @@ COMMENT= Emacs mode for GNU cflow output
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
do-build:
${EMACS_BIN} --no-init-file -batch -f batch-byte-compile \
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= cmake-mode
@@ -25,5 +25,5 @@ do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}
${INSTALL_DATA} ${WRKSRC}/cmake-mode.* ${DESTDIR}${EMACS_LISPPREFIX}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/02/04 20:10:35 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= cqual-0.991
@@ -32,5 +32,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${PREFIX:Q}/share/doc/cqual/
${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${PREFIX:Q}/share/examples/cqual/
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/08/11 08:51:05 dsainty Exp $
+# $NetBSD: Makefile,v 1.6 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= doxymacs-1.8.0
@@ -10,7 +10,9 @@ MAINTAINER= dsainty@NetBSD.org
HOMEPAGE= http://doxymacs.sourceforge.net/
COMMENT= Doxygen editing support for Emacs
-.include "../../mk/emacs.mk"
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../editors/emacs/modules.mk"
#
# "www/w3" (Emacs/W3) currently does not work with Emacs 22. Emacs/W3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= elib-1.0
@@ -10,7 +10,7 @@ COMMENT= Library of utility functions for Emacs
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q}
MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/25 13:16:10 dillo Exp $
+# $NetBSD: Makefile,v 1.14 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= ilisp-20021222
@@ -36,5 +36,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/extra/*.el ${DESTDIR}${SITELISP}/extra
${INSTALL_DATA} ${WRKSRC}/extra/*.elc ${DESTDIR}${SITELISP}/extra
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/11/12 05:34:10 uebayasi Exp $
+# $NetBSD: Makefile,v 1.28 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= flim-1.14.7
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,6 +12,10 @@ COMMENT= Emacs lisp library for message representation/encoding
BUILD_DEPENDS+= qkc-[0-9]*:../../converters/qkc
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/flim \
+ ${EMACS_INFOPREFIX:C|^${PREFIX}/||}
+
BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}}
INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
MAKEFLAGS= ${MAKEFLAGS.${EMACS_FLAVOR}}
@@ -38,13 +42,22 @@ post-build:
makeinfo --force --no-validate $${i}.texi; \
done
+do-install: plist
+ cd ${WRKSRC}; \
+ grep -v '^@' ${PLIST} | grep '/site-lisp/flim/' | \
+ while read file; do \
+ file=$$( basename $$file ); \
+ ${INSTALL_DATA} $$file \
+ ${DESTDIR}${EMACS_LISPPREFIX}/flim/$$file; \
+ done
+
post-install:
cd ${WRKSRC}; for f in mime-*.info mime-*.info-[0-9]*; do \
${TEST} ! -f "$$f" || \
- ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX}; \
+ ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \
done
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../devel/apel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= haskell-mode-1.44
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,6 +11,8 @@ HOMEPAGE= http://www.haskell.org/haskell-mode/
COMMENT= Haskell mode for Emacs
PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/haskell-mode \
+ share/doc/html/haskell-mode
HTML= .emacs fontlock.hs indent.hs index.html installation-guide.html
SRCS= haskell-decl-scan.el haskell-doc.el haskell-font-lock.el \
@@ -24,12 +26,10 @@ do-build:
done
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode
cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} \
${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/haskell-mode
cd ${WRKSRC} && ${INSTALL_DATA} ${HTML} \
${DESTDIR}${PREFIX}/share/doc/html/haskell-mode
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
Oops, something went wrong.

0 comments on commit 0abaefc

Please sign in to comment.