mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Bowler
2012-12-15 00:01:32 -06:00
committed by Glenn Randers-Pehrson
parent 508a744251
commit ab43bdaa84
4 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ANNOUNCE
View File

@@ -44,6 +44,7 @@ Version 1.5.14beta02 [December 15, 2012]
although for build test purposes, --enable-arm-neon now builds on non-ARM although for build test purposes, --enable-arm-neon now builds on non-ARM
systems. systems.
Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5. Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5.
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

1
CHANGES
View File

@@ -3937,6 +3937,7 @@ Version 1.5.14beta02 [December 15, 2012]
although for build test purposes, --enable-arm-neon now builds on non-ARM although for build test purposes, --enable-arm-neon now builds on non-ARM
systems. systems.
Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5. Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5.
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

34
Makefile.am
View File

@@ -198,22 +198,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;\
@@ -221,9 +223,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'

34
Makefile.in
View File

@@ -1512,22 +1512,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;\
@@ -1535,12 +1537,12 @@ 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'
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.