Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stuart John Watson
mw
Commits
9c7748ee
Commit
9c7748ee
authored
9 years ago
by
Andrew Price
Browse files
Options
Downloads
Patches
Plain Diff
Fix 'make deb' and don't install libmozjs.so
parent
9a9ba241
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+2
-3
2 additions, 3 deletions
Makefile
Makefile.common
+2
-3
2 additions, 3 deletions
Makefile.common
debian-template/control
+1
-1
1 addition, 1 deletion
debian-template/control
debian-template/mw3.install
+0
-1
0 additions, 1 deletion
debian-template/mw3.install
with
5 additions
and
8 deletions
Makefile
+
2
−
3
View file @
9c7748ee
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Makefile.common
+
2
−
3
View file @
9c7748ee
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
debian-template/control
+
1
−
1
View file @
9c7748ee
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
debian-template/mw3.install
+
0
−
1
View file @
9c7748ee
usr
/
lib
/
libmozjs
*
usr
/
bin
/
mw
usr
/
lib
/
mw
/*
usr
/
share
/
locale
/*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment