[libpng17] Fixed cases of unquoted DESTDIR in Makefile.am.

This commit is contained in:
John Bowler 2012-12-15 09:48:10 -06:00 committed by Glenn Randers-Pehrson
parent 0f2a5bac64
commit 1fa858db48
3 changed files with 20 additions and 16 deletions

View File

@ -58,6 +58,7 @@ Version 1.7.0alpha01 [December 15, 2012]
Rearranged ARM-NEON optimizations to isolate the machine specific code to Rearranged ARM-NEON optimizations to isolate the machine specific code to
the hardware subdirectory, and add comments to pngrutil.c so that the hardware subdirectory, and add comments to pngrutil.c so that
implementors of other optimizations will know what to do. implementors of other optimizations will know what to do.
Fixed cases of unquoted DESTDIR in Makefile.am.
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

View File

@ -4343,6 +4343,7 @@ Version 1.7.0alpha01 [December 15, 2012]
Rearranged ARM-NEON optimizations to isolate the machine specific code to Rearranged ARM-NEON optimizations to isolate the machine specific code to
the hardware subdirectory, and add comments to pngrutil.c so that the hardware subdirectory, and add comments to pngrutil.c so that
implementors of other optimizations will know what to do. implementors of other optimizations will know what to do.
Fixed cases of unquoted DESTDIR in Makefile.am.
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

View File

@ -237,22 +237,24 @@ dist-hook:
# install the .../include headers as links to the new ones # install the .../include headers as links to the new ones
install-data-hook: install-data-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \ cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
pngconf.h pngconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \ cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
pnglibconf.h pnglibconf.h
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc cd '$(DESTDIR)$(pkgconfigdir)'; rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc cd '$(DESTDIR)$(pkgconfigdir)'; $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used # do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used
install-exec-hook: install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config cd '$(DESTDIR)$(bindir)'; rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config cd '$(DESTDIR)$(bindir)';\
$(LN_S) $(PNGLIB_BASENAME)-config libpng-config
@set -x;\ @set -x;\
cd $(DESTDIR)$(libdir);\ cd '$(DESTDIR)$(libdir)';\
for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib dll.a; do\ for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\
sl dylib dll.a; do\
rm -f libpng.$$ext;\ rm -f libpng.$$ext;\
if test -f $(PNGLIB_BASENAME).$$ext; then\ if test -f $(PNGLIB_BASENAME).$$ext; then\
$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
@ -260,9 +262,9 @@ install-exec-hook:
done done
uninstall-hook: uninstall-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc rm -f '$(DESTDIR)$(pkgconfigdir)/libpng.pc'
rm -f $(DESTDIR)$(bindir)/libpng-config rm -f '$(DESTDIR)$(bindir)/libpng-config'
rm -f $(DESTDIR)$(libdir)/libpng.a rm -f '$(DESTDIR)$(libdir)/libpng.a'
rm -f $(DESTDIR)$(libdir)/libpng.la rm -f '$(DESTDIR)$(libdir)/libpng.la'
rm -f $(DESTDIR)$(libdir)/libpng.dll.a rm -f '$(DESTDIR)$(libdir)/libpng.dll.a'