From 6cf79b5b408858acd9e5bae5f3129c76e80da7e9 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Sat, 30 May 2009 10:08:23 +0000 Subject: Fix build with custom PREFIX. Reported by: QATty --- audio/emms/Makefile | 3 ++- audio/emms/files/patch-Makefile | 24 +++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'audio/emms') diff --git a/audio/emms/Makefile b/audio/emms/Makefile index 63ea0b23be78..7026bf684ecf 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -23,7 +23,8 @@ PORTNAMESUFFIX= ${PKGNAMESUFFIX} .endif USE_GMAKE= yes -MAKE_ENV+= EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} +MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \ + EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} INFO= emms MAN1= emms-print-metadata.1 diff --git a/audio/emms/files/patch-Makefile b/audio/emms/files/patch-Makefile index 5d2a62c9cb89..c3dd847a83da 100644 --- a/audio/emms/files/patch-Makefile +++ b/audio/emms/files/patch-Makefile @@ -1,22 +1,28 @@ ---- Makefile.orig Sat Apr 29 22:28:28 2006 -+++ Makefile Wed May 24 03:31:25 2006 +--- ./Makefile.orig 2007-06-29 19:16:24.000000000 +0300 ++++ ./Makefile 2009-05-30 12:56:48.565749310 +0300 @@ -1,4 +1,4 @@ -EMACS=emacs +EMACS=$(EMACS_NAME)-$(EMACS_VER) SITEFLAG=--no-site-file GZIP=gzip ALLSOURCE=$(wildcard *.el) -@@ -11,10 +11,10 @@ - DESTDIR= - PREFIX=$(DESTDIR)/usr/local - INFODIR=$(PREFIX)/info +@@ -8,13 +8,13 @@ + TARGET=$(patsubst %.el,%.elc,$(SOURCE)) + MAN1PAGES=emms-print-metadata.1 + +-DESTDIR= +-PREFIX=$(DESTDIR)/usr/local +-INFODIR=$(PREFIX)/info -MAN1DIR=$(PREFIX)/share/man/man1 -SITELISP=$(PREFIX)/share/emacs/site-lisp/emms -+MAN1DIR=$(PREFIX)/man/man1 -+SITELISP=$(PREFIX)/$(EMACS_SITE_LISPDIR)/emms ++DESTDIR?= ++PREFIX?=$(DESTDIR)/usr/local ++INFODIR?=$(PREFIX)/info ++MAN1DIR?=$(PREFIX)/man/man1 ++SITELISP?=$(PREFIX)/$(EMACS_SITE_LISPDIR)/emms -INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR) -+INSTALLINFO = /usr/bin/install-info --info-dir=$(INFODIR) ++INSTALLINFO?= /usr/bin/install-info --info-dir=$(INFODIR) .PHONY: all install deb-install clean .PRECIOUS: %.elc %.info %.html -- cgit v1.2.3