From c2891d00117468b7ce748052d3af78f2dfbf383b Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:13:36 -0500
Subject: [PATCH] [devel] Reverted Makefile.am and Makefile.in to 1.5.4 status.

---
 Makefile.am | 2 +-
 Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4f83aa2e5..beb7a2572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,7 +162,7 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	test -z "$(CPPFLAGS)"
 	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
 	$(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
 	rm dfn1.out
 	mv dfn2.out $@
diff --git a/Makefile.in b/Makefile.in
index 4324ecd55..20e0111c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,7 +160,7 @@ distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 
 #distribute headers in /usr/include/libpng/*
-pkgincludedir = $(DESTDIR)$(includedir)/$(PNGLIB_BASENAME)
+pkgincludedir = $(includedir)/$(PNGLIB_BASENAME)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@