From 87f580c152c784deff1238a99002782da492db43 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Tue, 17 Jul 2001 13:13:37 +0000 Subject: [PATCH] added DESTDIR support as per bug 60 --- ChangeLog | 6 ++++++ html/Makefile.in | 6 +++--- libtiff/Makefile.in | 22 +++++++++++----------- man/Makefile.in | 14 ++++++++------ tools/Makefile.in | 28 ++++++++++++++++------------ 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81eb1fdf..d6eb24d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-07-17 Frank Warmerdam + + * */Makefile.in: added DESTDIR support. + + http://bugzilla.remotesensing.org/show_bug.cgi?id=60 + 2001-07-16 Frank Warmerdam * configure, libtiff/Makefile.in: applied OpenBSD patches diff --git a/html/Makefile.in b/html/Makefile.in index 2c2e316e..3cb9cfed 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /cvs/maptools/cvsroot/libtiff/html/Makefile.in,v 1.4 2001-04-06 03:02:33 warmerda Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/html/Makefile.in,v 1.5 2001-07-17 13:13:37 warmerda Exp $ # # @WARNING@ # @@ -101,9 +101,9 @@ TARGETS= all: ${TARGETS} install: all - ${INSTALL} -m 755 -dir -idb tiff.man.html ${HTML} ${HTML}/images + ${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${HTML}/images for i in ${HTMLFILES} ${IMAGES}; do \ - ${INSTALL} -idb tiff.man.html -m 444 -F ${HTML} \ + ${INSTALL} -idb tiff.man.html -m 444 -F ${DESTDIR}${HTML} \ -src ${SRCDIR}/$$i -O $$i; \ done diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 09659037..433a2bca 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.14 2001-07-16 20:42:59 warmerda Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.15 2001-07-17 13:13:37 warmerda Exp $ # # Tag Image File Format Library # @@ -347,37 +347,37 @@ INCS = ${SRCDIR}/tiff.h ${SRCDIR}/tiffio.h ${SRCDIR}/tiffconf.h \ INCS_PRIVATE = ${SRCDIR}/tiffiop.h ${SRCDIR}/tif_dir.h ${SRCDIR}/port.h installHdrs: ${INCS} - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ + ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@ for i in ${INCS}; do \ f=`basename $$i`; \ - ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \ + ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@ \ -src $$i -O $$f; \ done installPrivateHdrs: ${INCS_PRIVATE} - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ + ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@ for i in ${INCS_PRIVATE}; do \ f=`basename $$i`; \ - ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \ + ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@ \ -src $$i -O $$f; \ done installDSO: @DSO@dso if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ - ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ + ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \ -O libtiff.@DSOSUF_VERSION@; \ - ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ + ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \ -lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ - ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ + ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \ -lns libtiff.@DSOSUF@ -O libtiff.so; \ else \ - ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ + ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \ -O libtiff.@DSOSUF@; \ fi install: all installHdrs - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ - ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a + ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@ + ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a if [ @DSO@dso != nodso ]; then \ ${MAKE} -${MAKEFLAGS} installDSO; \ else \ diff --git a/man/Makefile.in b/man/Makefile.in index 13eb6eb9..16f2b7a4 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /cvs/maptools/cvsroot/libtiff/man/Makefile.in,v 1.7 2001-06-13 15:26:44 warmerda Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/man/Makefile.in,v 1.8 2001-07-17 13:13:37 warmerda Exp $ # # @WARNING@ # @@ -339,7 +339,8 @@ apps/Makefile: ${ECHO} 'install:'; \ for i in *.1; do \ f=${MANAPPNAME}; \ - ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS} \ + ${ECHO} ' cd ..; ${INSTALL} -m 444 \ + -F ${DESTDIR}${MAN}/${MANAPPS} \ -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \ done \ )>apps/Makefile @@ -351,16 +352,17 @@ lib/Makefile: ${ECHO} 'install:'; \ for i in *.3t; do \ f=${MANLIBNAME}; \ - ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB} \ + ${ECHO} ' cd ..; ${INSTALL} -m 444 \ + -F ${DESTDIR}${MAN}/${MANLIB} \ -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \ done \ )>lib/Makefile install: all - ${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN} - ${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN}/${MANAPPS} + ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN} + ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN}/${MANAPPS} cd apps; ${MAKE} -${MAKEFLAGS} install - ${INSTALL} -m 755 -dir -idb tiff.man.dev ${MAN}/${MANLIB} + ${INSTALL} -m 755 -dir -idb tiff.man.dev ${DESTDIR}${MAN}/${MANLIB} cd lib; ${MAKE} -${MAKEFLAGS} install clean: diff --git a/tools/Makefile.in b/tools/Makefile.in index 6b382d1a..594a5278 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.in,v 1.8 2001-04-06 03:02:33 warmerda Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.in,v 1.9 2001-07-17 13:13:37 warmerda Exp $ # # @WARNING@ # @@ -111,20 +111,24 @@ all: ${TARGETS} true; \ fi install: all - ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -dir @DIR_BIN@ - ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS} - @if [ "@LIBIMAGE@" = yes ]; then \ - ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \ - else \ - true; \ + ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \ + -dir ${DESTDIR}@DIR_BIN@ + ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \ + -F ${DESTDIR}@DIR_BIN@ -O ${TARGETS} + @if [ "@LIBIMAGE@" = yes ]; then \ + ${INSTALL} -idb tiff.sw.tools -m 755 \ + -F ${DESTDIR}@DIR_BIN@ -O sgi2tiff; \ + else \ + true; \ fi - @if [ "@LIBGL@" = yes ]; then \ - ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O tiffgt tiffsv;\ - else \ - true; \ + @if [ "@LIBGL@" = yes ]; then \ + ${INSTALL} -idb tiff.sw.tools -m 755 -F ${DESTDIR}@DIR_BIN@ \ + -O tiffgt tiffsv; \ + else \ + true; \ fi clean: - rm -f ${TARGETS} ${OBJS} sgigt.o tiffgt sgisv.o tiffsv \ + rm -f ${TARGETS} ${OBJS} sgigt.o tiffgt sgisv.o tiffsv \ sgi2tiff.o sgi2tiff core a.out ycbcr #