[master] Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
to put png.h and pngconf.h in $prefix/include, like the other scripts, instead of in $prefix/include/libpng.
This commit is contained in:
parent
878fea5403
commit
df61a00acc
3
ANNOUNCE
3
ANNOUNCE
@ -45,6 +45,9 @@ Changes since the last public release (1.2.41):
|
|||||||
version 1.2.42beta01 [December 4, 2009]
|
version 1.2.42beta01 [December 4, 2009]
|
||||||
Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added
|
Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added
|
||||||
to pngconf.h in version 1.2.41.
|
to pngconf.h in version 1.2.41.
|
||||||
|
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
|
||||||
|
to put png.h and pngconf.h in $prefix/include, like the other scripts,
|
||||||
|
instead of in $prefix/include/libpng.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
|
|
||||||
|
3
CHANGES
3
CHANGES
@ -2608,6 +2608,9 @@ version 1.2.41 [December 3, 2009]
|
|||||||
version 1.2.42 [December 4, 2009]
|
version 1.2.42 [December 4, 2009]
|
||||||
Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added
|
Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added
|
||||||
to pngconf.h in version 1.2.41.
|
to pngconf.h in version 1.2.41.
|
||||||
|
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
|
||||||
|
to put png.h and pngconf.h in $prefix/include, like the other scripts,
|
||||||
|
instead of in $prefix/include/libpng.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
@ -2,18 +2,18 @@
|
|||||||
# make obj && make depend && make && make test
|
# make obj && make depend && make && make test
|
||||||
# make includes && make install
|
# make includes && make install
|
||||||
# Copyright (C) 2002 Patrick R.L. Welche
|
# Copyright (C) 2002 Patrick R.L. Welche
|
||||||
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
|
# Copyright (C) 2007-2009 Glenn Randers-Pehrson
|
||||||
#
|
#
|
||||||
# This code is released under the libpng license.
|
# This code is released under the libpng license.
|
||||||
# For conditions of distribution and use, see the disclaimer
|
# For conditions of distribution and use, see the disclaimer
|
||||||
# and license in png.h
|
# and license in png.h
|
||||||
|
|
||||||
# You should also run makefile.ne0bsd
|
# You should also run makefile.ne12bsd
|
||||||
|
|
||||||
LOCALBASE?=/usr/local
|
LOCALBASE?=/usr/local
|
||||||
LIBDIR= ${LOCALBASE}/lib
|
LIBDIR= ${LOCALBASE}/lib
|
||||||
MANDIR= ${LOCALBASE}/man
|
MANDIR= ${LOCALBASE}/man
|
||||||
INCSDIR=${LOCALBASE}/include/libpng
|
INCSDIR=${LOCALBASE}/include
|
||||||
|
|
||||||
LIB= png
|
LIB= png
|
||||||
SHLIB_MAJOR= 3
|
SHLIB_MAJOR= 3
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# makefile for libpng
|
# makefile for libpng
|
||||||
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
||||||
# Copyright (C) 2007-2008 Glenn Randers-Pehrson
|
# Copyright (C) 2007-2009 Glenn Randers-Pehrson
|
||||||
#
|
#
|
||||||
# This code is released under the libpng license.
|
# This code is released under the libpng license.
|
||||||
# For conditions of distribution and use, see the disclaimer
|
# For conditions of distribution and use, see the disclaimer
|
||||||
@ -42,7 +42,7 @@ test: pngtest
|
|||||||
|
|
||||||
beforeinstall:
|
beforeinstall:
|
||||||
if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
||||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
|
||||||
fi
|
fi
|
||||||
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
||||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
||||||
@ -67,7 +67,7 @@ afterinstall:
|
|||||||
@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
||||||
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
|
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
|
@ -44,7 +44,7 @@ ZLIBINC=../zlib
|
|||||||
CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
|
CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
|
||||||
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
|
LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
|
||||||
|
|
||||||
INCPATH=$(prefix)/include/libpng
|
INCPATH=$(prefix)/include
|
||||||
LIBPATH=$(exec_prefix)/lib
|
LIBPATH=$(exec_prefix)/lib
|
||||||
MANPATH=$(prefix)/man
|
MANPATH=$(prefix)/man
|
||||||
BINPATH=$(exec_prefix)/bin
|
BINPATH=$(exec_prefix)/bin
|
||||||
|
Reference in New Issue
Block a user