View | Details | Raw Unified | Return to bug 72856
Collapse All | Expand All

(-)patch-aa.new (-4 / +11 lines)
Lines 1-5 Link Here
1
--- scripts/makefile.freebsd	Sat May 18 10:46:45 2002
1
--- scripts/makefile.freebsd	Sat May 18 23:46:45 2002
2
+++ scripts/makefile.freebsd	Mon Oct 20 00:05:40 2003
2
+++ scripts/makefile.freebsd	Tue Oct 19 11:09:06 2004
3
@@ -25,7 +25,7 @@
3
@@ -25,7 +25,7 @@
4
 DPADD+=         ${LIBM} ${LIBZ}
4
 DPADD+=         ${LIBM} ${LIBZ}
5
 
5
 
Lines 9-21 Link Here
9
 CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
9
 CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
10
 .endif
10
 .endif
11
 
11
 
12
@@ -34,7 +34,7 @@
12
@@ -33,13 +33,13 @@
13
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
13
 	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
14
 	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
14
 
15
 
15
-pngtest: pngtest.o libpng.a
16
-pngtest: pngtest.o libpng.a
16
+pngtest: pngtest.o ${SHLIB_NAME}
17
-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
17
-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
18
+pngtest: pngtest.o ${SHLIB_NAME}
18
+	${CC} ${CFLAGS} -L. -Wl,-rpath=${.OBJDIR} -o pngtest pngtest.o -lpng -lz -lm
19
+	${CC} ${CFLAGS} -L. -Wl,-rpath=${.OBJDIR} -o pngtest pngtest.o -lpng -lz -lm
19
 
20
 
20
 CLEANFILES= pngtest pngtest.o pngout.png
21
 CLEANFILES= pngtest pngtest.o pngout.png
21
 
22
 
23
 test: pngtest
24
-	./pngtest
25
+	env LD_LIBRARY_PATH=. ./pngtest
26
 
27
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
28
 writelock:

Return to bug 72856