]> git.sesse.net Git - vlc/commitdiff
ALL: Don't use character which are different in utf8 and latin*
authorChristophe Mutricy <xtophe@videolan.org>
Fri, 24 Feb 2006 10:53:29 +0000 (10:53 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Fri, 24 Feb 2006 10:53:29 +0000 (10:53 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/libpng-1.2.5-win32.patch

index 880ba6ac936f1f4e0df2c6f9b4f6e569608f044c..00651bd2cf284507e97fb030aa8de7974a1c404e 100644 (file)
@@ -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
index 9fa7943eeb33ae7d3b5edb38447a9ed4131120d4..975b257ca18df5d390cb8e488c00b73cc7843fd2 100644 (file)
@@ -15,14 +15,14 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
  ifndef prefix
 -prefix=/usr
 -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
-+prefix=££PREFIX££
++prefix=??PREFIX??
  endif
  
  # Where the zlib library and include files are located
 -ZLIBLIB= /usr/lib
 -ZLIBINC=
-+ZLIBLIB= ££PREFIX££/lib
-+ZLIBINC= ££PREFIX££/include
++ZLIBLIB= ??PREFIX??/lib
++ZLIBINC= ??PREFIX??/include
  #ZLIBLIB=../zlib
  #ZLIBINC=../zlib