From 227fb23c0e0fbc25685aba46a991493a7decb001 Mon Sep 17 00:00:00 2001
From: forcer <forcer>
Date: Sat, 29 Apr 2006 18:39:00 +0000
Subject: Install correctly with Debian _and_ make install.

darcs-hash:20060429183958-2189f-44de028e3face57316a1485fc9e09d29ecceb7eb.gz
---
 Makefile     | 23 ++++++++++++-----------
 debian/rules |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index be77c46..0fe2863 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 EMACS=emacs
 SITEFLAG=--no-site-file
+GZIP=gzip
 ALLSOURCE=$(wildcard *.el)
 ALLCOMPILED=$(wildcard *.elc)
 SPECIAL=emms-auto.el emms-maint.el
 SOURCE=$(filter-out $(SPECIAL),$(ALLSOURCE))
 TARGET=$(patsubst %.el,%.elc,$(SOURCE))
-PREFIX=/usr/local
-INFODIR=$(PREFIX)/info
-DESTDIR=$(PREFIX)/share/emacs/site-lisp/emms
+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
 
 INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
 
-# If you're using Debian, uncomment the following line and comment out
-# the above line.
-#INSTALLINFO = /usr/sbin/install-info --section "Emacs" "emacs" --info-dir=$(INFODIR)
-
 .PHONY: all install deb-install clean
 .PRECIOUS: %.elc %.info %.html
 all: $(TARGET) emms-auto.el emms.info
@@ -44,18 +44,19 @@ emms-print-metadata: emms-print-metadata.c
 	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
 
 install:
-	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
+	test -d $(SITELISP) || mkdir -p $(SITELISP)
 	[ -d $(INFODIR) ] || install -d $(INFODIR)
-	install -m 644 $(ALLSOURCE) $(DESTDIR)
-	install -m 644 $(ALLCOMPILED) $(DESTDIR)
+	install -m 644 $(ALLSOURCE) $(SITELISP)
+	install -m 644 $(ALLCOMPILED) $(SITELISP)
 	install -m 0644 emms.info $(INFODIR)/emms
+	for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done
 	$(INSTALLINFO) emms.info
 
 remove-info:
 	$(INSTALLINFO) --remove emms.info
 
 deb-install:
-	install -m 644 $(ALLSOURCE) $(DESTDIR)
+	install -m 644 $(ALLSOURCE) $(SITELISP)
 
 ChangeLog:
 	darcs changes > $@
diff --git a/debian/rules b/debian/rules
index 65c8978..825a527 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ install-indep:
 
 	# Add here commands to install the indep part of the package into
 	# debian/emms.
-	$(MAKE) deb-install DESTDIR=$(CURDIR)/debian/emms
+	$(MAKE) deb-install DESTDIR=$(CURDIR)/debian/emms PREFIX=$(CURDIR)/debian/emms/usr
 	dh_installinfo -i emms.info
 
 	dh_install -i
@@ -91,7 +91,7 @@ binary-common:
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
-#	dh_installman
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
-- 
cgit v1.2.3