libpng-norpath.patch

   1 --- libpng-1.2.5/scripts/makefile.gcmmx.orig    2003-04-21 02:18:40.000000000 +0200
   2 +++ libpng-1.2.5/scripts/makefile.gcmmx 2003-04-21 02:32:00.000000000 +0200
   3 @@ -55,8 +55,8 @@
   4  #      -m486 -malign-double -ffast-math \
   5  #      $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
   6
   7 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
   8 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
   9 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
  10 +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
  11
  12  RANLIB=ranlib
  13  #RANLIB=echo
  14 @@ -107,7 +107,7 @@
  15         echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
  16         echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \
  17         echo L_opts=\"-L$(LIBPATH)\"; \
  18 -       echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
  19 +       echo R_opts=\"\"; \
  20         echo libs=\"-lpng12 -lz -lm\"; \
  21         cat scripts/libpng-config-body.in ) > libpng-config
  22         chmod +x libpng-config
  23 @@ -213,7 +213,7 @@
  24  test-installed:
  25         $(CC) -I$(ZLIBINC) \
  26            `$(BINPATH)/libpng12-config --cflags` pngtest.c \
  27 -          -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
  28 +          -L$(ZLIBLIB) \
  29            -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
  30         ./pngtesti pngtest.png
  31
  32 --- libpng-1.2.5/scripts/makefile.linux.orig    2003-04-21 02:18:40.000000000 +0200
  33 +++ libpng-1.2.5/scripts/makefile.linux 2003-04-21 02:32:24.000000000 +0200
  34 @@ -34,8 +34,8 @@
  35  CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
  36         $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  37
  38 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
  39 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
  40 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
  41 +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
  42
  43  RANLIB=ranlib
  44  #RANLIB=echo
  45 @@ -85,7 +85,7 @@
  46         echo prefix=\"$(prefix)\"; \
  47         echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
  48         echo L_opts=\"-L$(LIBPATH)\"; \
  49 -       echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
  50 +       echo R_opts=\"\"; \
  51         echo libs=\"-lpng12 -lz -lm\"; \
  52         cat scripts/libpng-config-body.in ) > libpng-config
  53         chmod +x libpng-config
  54 @@ -185,7 +185,7 @@
  55  test-installed:
  56         $(CC) -I$(ZLIBINC) \
  57            `$(BINPATH)/libpng12-config --cflags` pngtest.c \
  58 -          -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
  59 +          -L$(ZLIBLIB) \
  60            -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
  61         ./pngtesti pngtest.png
  62