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
450
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
17c7666b
Commit
17c7666b
authored
13 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
contrib: remove $(OS) from package/prebuilt
parent
7011b14f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/main.mak
+4
-12
4 additions, 12 deletions
contrib/src/main.mak
with
4 additions
and
12 deletions
contrib/src/main.mak
+
4
−
12
View file @
17c7666b
...
...
@@ -270,20 +270,12 @@ distclean: clean
$(
RM
)
config.mak
unlink
Makefile
OS
=
ifdef
HAVE_MACOSX
OS
=
macosx
endif
ifdef
HAVE_WIN32
OS
=
win32
endif
PREBUILT_URL
=
ftp://ftp.videolan.org/pub/videolan/contrib/
$(
OS
)
/vlc-contrib-
$(
OS
)
-
$(
HOST
)
-latest
.tar.bz2
PREBUILT_URL
=
ftp://ftp.videolan.org/pub/videolan/contrib/vlc-contrib-
$(
HOST
)
-latest
.tar.bz2
vlc-contrib-$(
OS)-$(
HOST)-latest.tar.bz2
:
vlc-contrib-$(HOST)-latest.tar.bz2
:
$(
call download,
$(
PREBUILT_URL
))
prebuilt
:
vlc-contrib-$(
OS)-$(
HOST)-latest.tar.bz2
prebuilt
:
vlc-contrib-$(HOST)-latest.tar.bz2
$(
UNPACK
)
&&
mv
$(
HOST
)
$(
TOPDST
)
cd
$(
TOPDST
)
/
$(
HOST
)
&&
./change_prefix.sh
...
...
@@ -297,7 +289,7 @@ package: install
rm
-Rf
man sbin etc lib/lua lib/sidplay
cp
$(
SRC
)
/change_prefix.sh tmp/
$(
notdir
$(
PREFIX
))
/
cd
tmp/
$(
notdir
$(
PREFIX
))
&&
./change_prefix.sh
$(
PREFIX
)
@@CONTRIB_PREFIX@@
(
cd
tmp
&&
tar
c
$(
notdir
$(
PREFIX
))
/
)
| bzip2
-c
>
../vlc-contrib-
$(
OS
)
-
$(
HOST
)
-
$(
DATE
)
.tar.bz2
(
cd
tmp
&&
tar
c
$(
notdir
$(
PREFIX
))
/
)
| bzip2
-c
>
../vlc-contrib-
$(
HOST
)
-
$(
DATE
)
.tar.bz2
list
:
@
echo
All packages:
...
...
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