diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 14:06:06 (GMT) |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 14:06:06 (GMT) |
commit | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (patch) | |
tree | c5dc684986051654898db11ce73e03b9fec8db99 /src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch | |
download | Qt-f15b8a83e2e51955776a3f07cb85ebfc342dd8ef.zip Qt-f15b8a83e2e51955776a3f07cb85ebfc342dd8ef.tar.gz Qt-f15b8a83e2e51955776a3f07cb85ebfc342dd8ef.tar.bz2 |
Initial import of statemachine branch from the old kinetic repository
Diffstat (limited to 'src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch')
-rw-r--r-- | src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch b/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch new file mode 100644 index 0000000..a73b79d --- /dev/null +++ b/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch @@ -0,0 +1,38 @@ +--- libmng/makefiles/makefile.linux.orig Sat Jul 1 15:10:35 2000 ++++ libmng/makefiles/makefile.linux Sat Jul 1 15:14:52 2000 +@@ -13,19 +13,19 @@ + OPTIONS = -DMNG_BUILD_SO + + # where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h +-prefix=/usr/local ++prefix=/usr + + # Where the zlib library and include files are located +-ZLIBLIB=../zlib +-ZLIBINC=../zlib ++ZLIBLIB=/usr/lib ++ZLIBINC=/usr/include + + # Where the jpeg library and include files are located +-JPEGLIB=../jpgsrc +-JPEGINC=../jpgsrc ++JPEGLIB=/usr/lib ++JPEGINC=/usr/include + + # Where the lcms library and include files are located +-LCMSLIB=../lcms/lib +-LCMSINC=../lcms/source ++LCMSLIB=/usr/lib ++LCMSINC=/usr/include + + ALIGN= + # for i386: +@@ -37,7 +37,7 @@ + + # for pgcc version 2.95.1, -O3 is buggy; don't use it. + +-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \ ++CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall $(RPM_OPT_FLAGS) \ + $(OPTIONS) $(ALIGN) # $(WARNMORE) -g + LDFLAGS=-L. -Wl,-rpath,. \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |