diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-07-22 15:59:10 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-07-22 15:59:10 +0000 |
| commit | 21d0a823b5f64778096c12c1e6a73974b62a566d (patch) | |
| tree | f84103a3e6a1b514f1b29362f8c14e0c7e097184 /configure | |
| parent | 021551c58709d041a81fcb191aa8ed2a1726da0c (diff) | |
10l: Uppercase some more overlooked makefile variables.
Originally committed as revision 9778 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -872,7 +872,7 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' EXESUF="" BUILDSUF="" -LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"' +LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"' # find source path source_path="`dirname \"$0\"`" @@ -1110,7 +1110,7 @@ case $targetos in dv1394="no" need_memalign="no" LIBOBJFLAGS="\$(PIC)" - LDCONFIG="ldconfig -m \$(shlibdir)" + LDCONFIG="ldconfig -m \$(SHLIBDIR)" SHFLAGS='-shared' SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME)' @@ -1134,8 +1134,8 @@ case $targetos in darwin) dv1394="no" need_memalign="no" - SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" - VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@' + SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(SHLIBDIR)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" + VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@' osextralibs="" strip="strip -x" FFLDFLAGS="-Wl,-dynamic,-search_paths_first" @@ -1158,7 +1158,7 @@ case $targetos in SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" - SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"\$(shlibdir)/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\"" + SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"\$(SHLIBDIR)/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\"" SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base" enabled network && add_extralibs -lws2_32 ;; |