[devel] Reverted Makefile.am and Makefile.in to 1.5.4 status.

This commit is contained in:
Glenn Randers-Pehrson 2011-07-13 21:13:36 -05:00
parent 25e0f55586
commit c2891d0011
2 changed files with 2 additions and 2 deletions

View File

@ -162,7 +162,7 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
test -z "$(CPPFLAGS)" test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\ echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
logunsupported=5 - ${srcdir}/scripts/pnglibconf.dfa 1>&2 logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2 $(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out rm dfn1.out
mv dfn2.out $@ mv dfn2.out $@

View File

@ -160,7 +160,7 @@ distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
#distribute headers in /usr/include/libpng/* #distribute headers in /usr/include/libpng/*
pkgincludedir = $(DESTDIR)$(includedir)/$(PNGLIB_BASENAME) pkgincludedir = $(includedir)/$(PNGLIB_BASENAME)
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AR = @AR@ AR = @AR@