← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libmng/oneiric

« back to all changes in this revision

Viewing changes to doc/rpm/libmng-1.0.8-rhconf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Shiju p. Nair
  • Date: 2004-09-27 10:29:48 UTC
  • mfrom: (0.2.1 upstream) (1.1.1 warty)
  • Revision ID: james.westby@ubuntu.com-20040927102948-k2hbz9ywsf6d3fy3
Tags: 1.0.8-1
http://bugs.debian.org/250106
http://bugs.debian.org/256526
http://bugs.debian.org/218469
* New upstream release (closes: #250106).
* Removed unwanted dependencies (closes: #256526, #218469)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/rpm/libmng-1.0.8-rhconf.patch
 
1
--- libmng/makefiles/makefile.linux.orig        Sat Jul  1 15:10:35 2000
 
2
+++ libmng/makefiles/makefile.linux     Sat Jul  1 15:14:52 2000
 
3
@@ -13,19 +13,19 @@
 
4
 OPTIONS = -DMNG_BUILD_SO
 
5
 
 
6
 # where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
 
7
-prefix=/usr/local
 
8
+prefix=/usr
 
9
 
 
10
 # Where the zlib library and include files are located
 
11
-ZLIBLIB=../zlib
 
12
-ZLIBINC=../zlib
 
13
+ZLIBLIB=/usr/lib
 
14
+ZLIBINC=/usr/include
 
15
 
 
16
 # Where the jpeg library and include files are located
 
17
-JPEGLIB=../jpgsrc
 
18
-JPEGINC=../jpgsrc
 
19
+JPEGLIB=/usr/lib
 
20
+JPEGINC=/usr/include
 
21
 
 
22
 # Where the lcms library and include files are located
 
23
-LCMSLIB=../lcms/lib
 
24
-LCMSINC=../lcms/source
 
25
+LCMSLIB=/usr/lib
 
26
+LCMSINC=/usr/include
 
27
 
 
28
 ALIGN=
 
29
 # for i386:
 
30
@@ -37,7 +37,7 @@
 
31
 
 
32
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
33
 
 
34
-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
 
35
+CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall $(RPM_OPT_FLAGS) \
 
36
        $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
 
37
 LDFLAGS=-L. -Wl,-rpath,. \
 
38
        -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \