Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
1342a322
Commit
1342a322
authored
Feb 24, 2006
by
Rémi Denis-Courmont
Browse files
Silly libgpg-error's autogen doesn't call libtoolize
parent
38cfac29
Changes
1
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Makefile
View file @
1342a322
...
...
@@ -7,7 +7,7 @@
# Authors: Christophe Massiot <massiot@via.ecp.fr>
# Derk-Jan Hartman <hartman at videolan dot org>
# Eric Petit <titer@m0k.org>
# Felix Khne <fkuehne@users.sourceforge.net>
# Felix K
ü
hne <fkuehne@users.sourceforge.net>
# Christophe Mutricy <xtophe@nxtelevision.com>
# Gildas Bazin <gbazin at videolan dot org>
#
...
...
@@ -1387,7 +1387,7 @@ libpng-$(PNG_VERSION).tar.bz2:
libpng
:
libpng-$(PNG_VERSION).tar.bz2
$(EXTRACT_BZ2)
ifdef
HAVE_WIN32
(
cd
$@
;
cat
../Patches/libpng-1.2.5-win32.patch |
sed
s,PREFIX,
$(PREFIX)
, | patch
-p0
)
(
cd
$@
;
cat
../Patches/libpng-1.2.5-win32.patch |
sed
s,
££
PREFIX
££
,
$(PREFIX)
, | patch
-p0
)
else
(
cat
Patches/libpng-osx.patch |
sed
-e
's%??PREFIX??%
$(PREFIX)
%'
-e
's%??EXTRA_CFLAGS??%
$(EXTRA_CFLAGS)
%'
-e
's%??EXTRA_LDFLAGS??%
$(EXTRA_LDFLAGS)
%'
| patch
-p0
)
endif
...
...
@@ -1438,7 +1438,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
$(EXTRACT_GZ)
.gpg-error
:
libgpg-error
(
cd
$<
;
./autogen.sh
&&
$(HOSTCC)
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
--disable-nls
&&
make
&&
make
install
)
(
cd
$<
;
./autogen.sh
&&
libtoolize
--force
&&
$(HOSTCC)
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
--disable-nls
&&
make
&&
make
install
)
$(INSTALL_NAME)
touch
$@
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment