Commit cd737e8f authored by Christophe Mutricy's avatar Christophe Mutricy

ALL: Don't use character which are different in utf8 and latin*

parent ba039afc
...@@ -1387,7 +1387,7 @@ libpng-$(PNG_VERSION).tar.bz2: ...@@ -1387,7 +1387,7 @@ libpng-$(PNG_VERSION).tar.bz2:
libpng: libpng-$(PNG_VERSION).tar.bz2 libpng: libpng-$(PNG_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
ifdef HAVE_WIN32 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 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) (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 endif
......
...@@ -15,14 +15,14 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin ...@@ -15,14 +15,14 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
ifndef prefix ifndef prefix
-prefix=/usr -prefix=/usr
-$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr") -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+prefix=PREFIX +prefix=??PREFIX??
endif endif
# Where the zlib library and include files are located # Where the zlib library and include files are located
-ZLIBLIB= /usr/lib -ZLIBLIB= /usr/lib
-ZLIBINC= -ZLIBINC=
+ZLIBLIB= PREFIX/lib +ZLIBLIB= ??PREFIX??/lib
+ZLIBINC= PREFIX/include +ZLIBINC= ??PREFIX??/include
#ZLIBLIB=../zlib #ZLIBLIB=../zlib
#ZLIBINC=../zlib #ZLIBINC=../zlib
......
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