1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Fix build for ELF.

This commit is contained in:
Steve Price 1998-10-05 02:56:45 +00:00
parent 3b6753feda
commit e991c1d141
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13643

View File

@ -1,45 +1,17 @@
*** Makefile.orig Thu Jun 3 11:30:50 1993
--- Makefile Tue Feb 17 14:37:50 1998
***************
*** 63,94 ****
--- Makefile.orig Thu Jun 3 11:30:50 1993
+++ Makefile Sun Oct 4 12:44:18 1998
@@ -63,32 +63,32 @@
#
################################################################
! INSTALL= ln
! BIN= /usr/mlm/bin/
! MAN= /usr/mlm/man/
! FTP= /usr/mlm/ftp/
! TIFINC= ../tiff/libtiff/
! TIFLIB= ../tiff/libtiff/
MANEXT= l
# Make the C compiler behave on the NeXT
! DBG= -g -D__STRICT_BSD__
#----------------JPEG linkage----------------
# If you don't have the JPEG library, use these two lines
! #JPEG=
! #JLIB=
# If you have the JPEG library, use the next lines instead
! JPEG= -DDO_JPEG -I../jpeg
! JLIB= -L../jpeg -ljpeg
#----------------Utah RLE linkage----------------
# If you don't have the Utah RLE library, use these two lines
RLE=
RLIB=
# If you have the Utah RLE library, use the next lines instead
! #RLE= -DRLE -I/usr/mlm/include
! #RLIB= -L. -lfbm -L/usr/mlm/lib -lrle
LIB= -L. -lfbm $(JLIB) $(RLIB)
--- 63,94 ----
#
################################################################
! INSTALL= install
! BIN= $(PREFIX)/bin/
-INSTALL= ln
-BIN= /usr/mlm/bin/
-MAN= /usr/mlm/man/
-FTP= /usr/mlm/ftp/
-TIFINC= ../tiff/libtiff/
-TIFLIB= ../tiff/libtiff/
+INSTALL= install -c
+BIN= $(PREFIX)/bin/
MANEXT= l
+MAN= $(PREFIX)/man/man$(MANEXT)/
+FTP= /usr/mlm/ftp/
@ -47,23 +19,30 @@
+TIFLIB= $(LOCALBASE)/lib/
# Make the C compiler behave on the NeXT
! # DBG= -g -D__STRICT_BSD__
-DBG= -g -D__STRICT_BSD__
+# DBG= -g -D__STRICT_BSD__
#----------------JPEG linkage----------------
# If you don't have the JPEG library, use these two lines
! JPEG=
! JLIB=
-#JPEG=
-#JLIB=
+JPEG=
+JLIB=
# If you have the JPEG library, use the next lines instead
! #JPEG= -DDO_JPEG -I$(LOCALBASE)/include
! #JLIB= -L$(LOCALBASE)/lib -ljpeg
-JPEG= -DDO_JPEG -I../jpeg
-JLIB= -L../jpeg -ljpeg
+#JPEG= -DDO_JPEG -I$(LOCALBASE)/include
+#JLIB= -L$(LOCALBASE)/lib -ljpeg
#----------------Utah RLE linkage----------------
# If you don't have the Utah RLE library, use these two lines
RLE=
RLIB=
# If you have the Utah RLE library, use the next lines instead
! #RLE= -DRLE -I$(LOCALBASE)/include
! #RLIB= -L. -lfbm -L$(LOCALBASE)/lib -lrle
-#RLE= -DRLE -I/usr/mlm/include
-#RLIB= -L. -lfbm -L/usr/mlm/lib -lrle
+#RLE= -DRLE -I$(LOCALBASE)/include
+#RLIB= -L. -lfbm -L$(LOCALBASE)/lib -lrle
LIB= -L. -lfbm $(JLIB) $(RLIB)