cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added DESTDIR support as per bug 60

Browse Source
This commit is contained in:
Frank Warmerdam 2001-07-17 13:13:37 +00:00
parent f45df42b1b
commit 87f580c152
5 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-07-17 Frank Warmerdam <warmerdam@pobox.com>
* */Makefile.in: added DESTDIR support.
http://bugzilla.remotesensing.org/show_bug.cgi?id=60
2001-07-16 Frank Warmerdam <warmerdam@pobox.com> 2001-07-16 Frank Warmerdam <warmerdam@pobox.com>
* configure, libtiff/Makefile.in: applied OpenBSD patches * configure, libtiff/Makefile.in: applied OpenBSD patches

6
html/Makefile.in
View File

@ -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@ # @WARNING@
# #
@ -101,9 +101,9 @@ TARGETS=
all: ${TARGETS} all: ${TARGETS}
install: all 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 \ 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; \ -src ${SRCDIR}/$$i -O $$i; \
done done

22
libtiff/Makefile.in
View File

@ -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 # 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 INCS_PRIVATE = ${SRCDIR}/tiffiop.h ${SRCDIR}/tif_dir.h ${SRCDIR}/port.h
installHdrs: ${INCS} 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 \ for i in ${INCS}; do \
f=`basename $$i`; \ 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; \ -src $$i -O $$f; \
done done
installPrivateHdrs: ${INCS_PRIVATE} 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 \ for i in ${INCS_PRIVATE}; do \
f=`basename $$i`; \ 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; \ -src $$i -O $$f; \
done done
installDSO: @DSO@dso installDSO: @DSO@dso
if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ 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@; \ -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@; \ -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; \ -lns libtiff.@DSOSUF@ -O libtiff.so; \
else \ 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@; \ -O libtiff.@DSOSUF@; \
fi fi
install: all installHdrs install: all installHdrs
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a
if [ @DSO@dso != nodso ]; then \ if [ @DSO@dso != nodso ]; then \
${MAKE} -${MAKEFLAGS} installDSO; \ ${MAKE} -${MAKEFLAGS} installDSO; \
else \ else \

14
man/Makefile.in
View File

@ -1,5 +1,5 @@
#! smake #! 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@ # @WARNING@
# #
@ -339,7 +339,8 @@ apps/Makefile:
${ECHO} 'install:'; \ ${ECHO} 'install:'; \
for i in *.1; do \ for i in *.1; do \
f=${MANAPPNAME}; \ 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"; \ -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \
done \ done \
)>apps/Makefile )>apps/Makefile
@ -351,16 +352,17 @@ lib/Makefile:
${ECHO} 'install:'; \ ${ECHO} 'install:'; \
for i in *.3t; do \ for i in *.3t; do \
f=${MANLIBNAME}; \ 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"; \ -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \
done \ done \
)>lib/Makefile )>lib/Makefile
install: all install: all
${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN} ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN}
${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN}/${MANAPPS} ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN}/${MANAPPS}
cd apps; ${MAKE} -${MAKEFLAGS} install 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 cd lib; ${MAKE} -${MAKEFLAGS} install
clean: clean:

14
tools/Makefile.in
View File

@ -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@ # @WARNING@
# #
@ -111,15 +111,19 @@ all: ${TARGETS}
true; \ true; \
fi fi
install: all install: all
${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -dir @DIR_BIN@ ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS} -dir ${DESTDIR}@DIR_BIN@
${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
@if [ "@LIBIMAGE@" = yes ]; then \ @if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \ ${INSTALL} -idb tiff.sw.tools -m 755 \
-F ${DESTDIR}@DIR_BIN@ -O sgi2tiff; \
else \ else \
true; \ true; \
fi fi
@if [ "@LIBGL@" = yes ]; then \ @if [ "@LIBGL@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O tiffgt tiffsv;\ ${INSTALL} -idb tiff.sw.tools -m 755 -F ${DESTDIR}@DIR_BIN@ \
-O tiffgt tiffsv; \
else \ else \
true; \ true; \
fi fi