Skip to content
Snippets Groups Projects
Commit 9c7748ee authored by Andrew Price's avatar Andrew Price
Browse files

Fix 'make deb' and don't install libmozjs.so

parent 9a9ba241
No related branches found
No related tags found
No related merge requests found
......@@ -6,14 +6,13 @@ build:
$(MAKE) -C src $@
$(MAKE) -C po $@
ifeq ($(SVNVER),exported)
ifeq ($(SVNVER),)
# These rules can only be called from inside an exported tree
install:
install -d $(DESTDIR)$(libdir)/mw
cp -a $(INSTALLFILES) $(DESTDIR)$(libdir)/mw/
install -d $(DESTDIR)$(initddir)
install mwserv.init $(DESTDIR)$(initddir)/mwserv
install mozjs/$(libdir)/libmozjs-17.0.so $(DESTDIR)$(libdir)
$(MAKE) -C src $@
$(MAKE) -C po $@
......@@ -35,7 +34,7 @@ ifdef TMPDIR
export:
rm -rf $(TMPDIR)/$(MWVERSION)
git checkout-index -a -f --prefix=$(TMPDIR)/$(MWVERSION)/
# Store the svn rev so we don't need to use svnversion or sed any more
# Store the git hash so we know it in the exported directory
echo $(VERSION_TWEAK) > $(TMPDIR)/$(MWVERSION)/mw.rev
install tarball rpm: export
......
......@@ -6,8 +6,8 @@ VERSION_MAJOR = 2
VERSION_MINOR = 17
ifeq ($(VERSION_TWEAK),)
ifeq ($(SVNVER),exported)
# mw.rev is created after an export so we can rely on it to provide the svn rev here
ifeq ($(SVNVER),)
# mw.rev is created after an export so we can rely on it to provide the git hash here
VERSION_TWEAK = $(shell cat $(SRCROOT)/mw.rev)
else
ifeq ($(SVNVER),0)
......@@ -18,7 +18,6 @@ endif
endif
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_TWEAK)
MWVERSION = mw3-$(VERSION)
prefix ?= /usr
......
......@@ -2,7 +2,7 @@ Source: mw3
Section: misc
Priority: extra
Maintainer: Milliways Developers <mw-devel@lists.sucs.org>
Build-Depends: debhelper (>= 8), libreadline-dev (>=5), libcurl4-dev | libcurl-dev, libmozjs-dev, libsqlite3-dev, libjansson-dev
Build-Depends: debhelper (>= 8), libreadline-dev (>=5), libcurl4-dev | libcurl-dev, libsqlite3-dev, libjansson-dev
Standards-Version: 3.7.2
Package: mw3
......
usr/lib/libmozjs*
usr/bin/mw
usr/lib/mw/*
usr/share/locale/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment