Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
503bc8df
Commit
503bc8df
authored
5 years ago
by
Rémi Denis-Courmont
Browse files
Options
Downloads
Patches
Plain Diff
contrib: remove exclamation mark in errors
GNU/make already appends a dot, so it looked weird.
parent
012537ad
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/main.mak
+6
-6
6 additions, 6 deletions
contrib/src/main.mak
with
6 additions
and
6 deletions
contrib/src/main.mak
+
6
−
6
View file @
503bc8df
...
...
@@ -242,14 +242,14 @@ ifeq ($(shell git --version >/dev/null 2>&1 || echo FAIL),)
GIT
=
git
endif
endif
GIT
?=
$(
error git not found
!
)
GIT
?=
$(
error git not found
)
ifndef
SVN
ifeq
($(shell svn --version >/dev/null 2>&1 || echo FAIL),)
SVN
=
svn
endif
endif
SVN
?=
$(
error subversion client
(
svn
)
not found
!
)
SVN
?=
$(
error subversion client
(
svn
)
not found
)
ifeq
($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
download
=
curl
-f
-L
--
"
$(
1
)
"
>
"
$@
"
...
...
@@ -264,7 +264,7 @@ download = (rm -f $@.tmp && \
touch
$@
.tmp
&&
\
mv
$@
.tmp
$@
)
else
download
=
$(
error Neither curl nor wget found
!
)
download
=
$(
error Neither curl nor wget found
)
endif
download_pkg
=
$(
call download,
$(
CONTRIB_VIDEOLAN
)
/
$(
2
)
/
$(
lastword
$(
subst /, ,
$(
@
))))
||
\
...
...
@@ -273,7 +273,7 @@ download_pkg = $(call download,$(CONTRIB_VIDEOLAN)/$(2)/$(lastword $(subst /, ,$
ifeq
($(shell which xz >/dev/null 2>&1 || echo FAIL),)
XZ
=
xz
else
XZ
?=
$(
error XZ
(
LZMA
)
compressor not found
!
)
XZ
?=
$(
error XZ
(
LZMA
)
compressor not found
)
endif
ifeq
($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
...
...
@@ -283,13 +283,13 @@ SHA512SUM = shasum -a 512 --check
else
ifeq
($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
SHA512SUM
=
openssl dgst
-sha512
else
SHA512SUM
=
$(
error SHA-512 checksumming not found
!
)
SHA512SUM
=
$(
error SHA-512 checksumming not found
)
endif
ifeq
($(shell protoc --version >/dev/null 2>&1 || echo FAIL),)
PROTOC
=
protoc
else
PROTOC
?=
$(
error Protobuf compiler
(
protoc
)
not found
!
)
PROTOC
?=
$(
error Protobuf compiler
(
protoc
)
not found
)
endif
#
...
...
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