1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Fix port to not create a rogue /tiff.sw.tools directory

during installation

PR:		16079
Submitted by:	Maxim Sobolev <sobomax@altavista.net>
This commit is contained in:
Chris D. Faulhaber 2000-01-23 20:44:27 +00:00
parent f1a7f718bb
commit 0b95c6ad0f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=24977

View File

@ -1,14 +1,33 @@
--- tools/Makefile.in.orig Tue Sep 2 13:54:34 1997
+++ tools/Makefile.in Sat Jan 23 10:44:45 1999
@@ -46 +46 @@
--- tools/Makefile.in.orig Mon Dec 20 18:46:11 1999
+++ tools/Makefile.in Sun Jan 23 15:39:20 2000
@@ -43,17 +43,17 @@
INSTALL = @INSTALL@
#
COPTS = @GCOPTS@
-OPTIMIZER=-O
+#OPTIMIZER=-O
@@ -48 +48 @@
IPATH = -I. -I${SRCDIR} -I${LIBDIR}
-CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
+CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
@@ -50 +50 @@
#
-TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@
+TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
@@ -56 +56 @@
LIBJPEG = @LIBJPEG@
LIBGZ = @LIBGZ@
LIBTIFF = @TIFFLIBREF@
LIBPORT = @LIBPORT@
MACHLIBS= @MACHDEPLIBS@
-LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
+LIBS = ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -ltiff
#
OBJS= \
fax2tiff.o \
@@ -108,7 +108,7 @@
true; \
fi
install: all
- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
+ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
${INSTALL} -idb nostrip 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; \