From 5e0a08d1e94e4953a3879d65ab447aa166af1271 Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Wed, 29 Jul 2009 01:31:43 +0200 Subject: * build-system: - add bindir_files feature and use that to install med-xpi-*pack as well as moz-version-compare to BINDIR; in turn adjust dh_install helper accordingly. - update src/Makefile - update debian/mozilla-devscripts.install --- src/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 6e6b360..09421f3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,6 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PREFIX ?= /usr +BINDIR ?= $(PREFIX)/bin DATADIR = $(PREFIX)/share/mozilla-devscripts @@ -47,9 +48,13 @@ subst_files = \ extra_files = \ xpi.mk \ lp-locale-export.mk \ - moz-version-compare \ $(NULL) +bindir_files = \ + med-xpi-pack \ + med-xpi-unpack \ + moz-version-compare + extra_dirs = \ mozclient \ mozclient/patches \ @@ -72,6 +77,8 @@ build: $(subst_files) install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*)) install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir)) install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR) + install -m 755 -d $(DESTDIR)$(BINDIR) + install -m 755 $(bindir_files) $(DESTDIR)$(BINDIR) for dir in $(extra_dirs) ; do \ install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \ done -- cgit v1.2.3