From dd1de02e513d0a4316ee945cf950e3e7bf86d0a6 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 2 Jun 2010 13:47:02 +0200 Subject: Use make install rule to copy binaries to the debian/tmp hierarchy when generating package. --- Makefile | 1 + debian/libmupdf-dev.install | 2 +- debian/mupdf-tools.install | 6 +++--- debian/mupdf.install | 2 +- debian/rules | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index af1dd874..f0d4b648 100644 --- a/Makefile +++ b/Makefile @@ -314,6 +314,7 @@ nuke: rm -rf build install: $(DIRS) $(APPS) $(MUPDF_LIB) + install -d $(prefix)/bin $(prefix)/lib $(prefix)/include install $(APPS) $(prefix)/bin install $(MUPDF_LIB) $(prefix)/lib install $(MUPDF_HDR) $(prefix)/include diff --git a/debian/libmupdf-dev.install b/debian/libmupdf-dev.install index 9c756d5e..e9399d62 100644 --- a/debian/libmupdf-dev.install +++ b/debian/libmupdf-dev.install @@ -3,5 +3,5 @@ fitz/fitz_base.h usr/include fitz/fitz_draw.h usr/include fitz/fitz_stream.h usr/include mupdf/mupdf.h usr/include -build/release/libmupdf.a usr/lib debian/mupdf.pc usr/lib/pkgconfig +debian/tmp/usr/lib/libmupdf.a diff --git a/debian/mupdf-tools.install b/debian/mupdf-tools.install index 4600e236..255de9dd 100644 --- a/debian/mupdf-tools.install +++ b/debian/mupdf-tools.install @@ -1,3 +1,3 @@ -build/release/pdfdraw usr/bin -build/release/pdfclean usr/bin -build/release/pdfshow usr/bin +debian/tmp/usr/bin/pdfclean +debian/tmp/usr/bin/pdfdraw +debian/tmp/usr/bin/pdfshow diff --git a/debian/mupdf.install b/debian/mupdf.install index 1874a973..15006a12 100644 --- a/debian/mupdf.install +++ b/debian/mupdf.install @@ -1,4 +1,4 @@ -build/release/mupdf usr/bin debian/mupdf.xpm usr/share/pixmaps debian/mupdf.desktop usr/share/applications debian/mupdf.applications usr/share/application-registry +debian/tmp/usr/bin/mupdf diff --git a/debian/rules b/debian/rules index 6cf6a5d0..6858577a 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ build: build-stamp build-stamp: dh_testdir dh_testroot - $(MAKE) "build=release" + $(MAKE) build=release prefix=$(CURDIR)/debian/tmp/usr install touch $@ clean: -- cgit v1.2.3