Imported from libpng-1.2.5rc3.tar
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 5542dde..0f8a55f 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.5rc2
+PNGMIN = 1.2.5rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -79,9 +79,12 @@
libpng-config:
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
- echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cflags=\"-xtarget=ultra -xarch=v9\"; \
- echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \
+ echo libdir=\"$(LIBPATH)\"; \
+ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ echo L_opts=\"-L$(LIBPATH)\"; \
+ echo R_opts=\"-R$(LIBPATH)\"; \
+ echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
+ echo ldopts=\"-xtarget=ultra -xarch=v9 \"; \
echo libs=\"-lpng12 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
@@ -185,8 +188,8 @@
echo
echo Testing installed dynamic shared library.
$(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \
- `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
- -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
+ `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+ -o pngtesti `$(BINPATH)/libpng12-config --ldflags ` \
$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
./pngtesti pngtest.png
