diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/mozilla-devscripts.install | 2 | ||||
| -rw-r--r-- | src/Makefile | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 75d0b1e..983177b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,12 @@ mozilla-devscripts (0.14) UNRELEASED; urgency=low - add prism@developers.mozilla.org 1.0 to list of auto detected target application packages - update src/xpi.mk + * 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 -- Alexander Sack <asac@ubuntu.com> Wed, 29 Jul 2009 01:08:07 +0200 diff --git a/debian/mozilla-devscripts.install b/debian/mozilla-devscripts.install index 2966fac..412da21 100644 --- a/debian/mozilla-devscripts.install +++ b/debian/mozilla-devscripts.install @@ -1,2 +1,2 @@ debian/tmp/usr/share/mozilla-devscripts -src/med-xpi-* usr/bin +debian/tmp/usr/bin 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 |