Skip to content

V
vlc-1.1
Commit 4c7f9a48 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix typos in static libraries installation

parent 837f796e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
bootstrap
View file @ 4c7f9a48
...@@ -218,7 +218,6 @@ BUILT_SOURCES = ...@@ -218,7 +218,6 @@ BUILT_SOURCES =
SUBDIRS = ${subdirs} SUBDIRS = ${subdirs}
SUFFIXES = _plugin\$(LIBEXT) _plugin.a SUFFIXES = _plugin\$(LIBEXT) _plugin.a
### TODO ought to be defined somewhere else ### TODO ought to be defined somewhere else
VLC_ENTRY = \$(SYMPREF)vlc_entry__0_8_2
libvlcdir = \$(libdir)/vlc/\$(basedir) libvlcdir = \$(libdir)/vlc/\$(basedir)
...@@ -249,7 +248,7 @@ all-modules: ...@@ -249,7 +248,7 @@ all-modules:
# Build a plugin with the adequate linker and linker's flags # Build a plugin with the adequate linker and linker's flags
_plugin.a_plugin\$(LIBEXT): _plugin.a_plugin\$(LIBEXT):
@mod="\$*" ; mod=\$\${mod:3} ; \ @mod="\$*" ; mod=\$\${mod:3} ; \
ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(VLC_ENTRY)" ; \ ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\ case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
c++) ld="\$(CXXLINK)" ;; \ c++) ld="\$(CXXLINK)" ;; \
objc) ld="\$(OBJCLINK)" ;; \ objc) ld="\$(OBJCLINK)" ;; \
...@@ -272,8 +271,8 @@ install-exec-local: all-modules ...@@ -272,8 +271,8 @@ install-exec-local: all-modules
for mod in \$(mods); do \ for mod in \$(mods); do \
case "\$\$z " \ case "\$\$z " \
in *\ \$\${mod}\ *) \ in *\ \$\${mod}\ *) \
echo \$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \ echo \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
\$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \ \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
;; \ ;; \
esac; \ esac; \
done done
...@@ -281,8 +280,8 @@ install-exec-local: all-modules ...@@ -281,8 +280,8 @@ install-exec-local: all-modules
for mod in \$(mods); do \ for mod in \$(mods); do \
case "\$\$z " \ case "\$\$z " \
in *\ \$\${mod}\ *) \ in *\ \$\${mod}\ *) \
echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \ echo \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
\$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \ \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
;; \ ;; \
esac; \ esac; \
done done
...@@ -291,8 +290,8 @@ if BUILD_MOZILLA ...@@ -291,8 +290,8 @@ if BUILD_MOZILLA
for mod in \$(mods); do \ for mod in \$(mods); do \
case "\$\$z " \ case "\$\$z " \
in *\ \$\${mod}\ *) \ in *\ \$\${mod}\ *) \
echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \ echo \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
\$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \ \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
;; \ ;; \
esac; \ esac; \
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment