MASTER_SITES _must_ have a trailing slash. While we're here make

this build.  From the looks of it, it wasn't just broken for ELF.
This commit is contained in:
Steve Price 1998-09-26 23:29:02 +00:00
parent dded088d05
commit 5cce0201b8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13410
3 changed files with 24 additions and 25 deletions

View File

@ -3,12 +3,12 @@
# Date created: 21 Feb 1998
# Whom: giffunip@asme.org
#
# $Id: Makefile,v 1.3 1998/08/05 09:30:41 asami Exp $
# $Id: Makefile,v 1.4 1998/09/24 18:54:22 jseger Exp $
#
DISTNAME= saoimage-1.22
CATEGORIES= astro
MASTER_SITES= ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/Old
MASTER_SITES= ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/Old/
MAINTAINER= giffunip@asme.org
@ -16,15 +16,13 @@ MAKEFILE= makefile
ALL_TARGET= FreeBSD
INSTALL_TARGET= -f makefile.$(ALL_TARGET) install_saobin install_saoman
BROKEN_ELF= build
MANL= saoimage.l
USE_X_PREFIX= yes
pre-patch:
$(CP) $(WRKSRC)/makefile.sun $(WRKSRC)/makefile.$(ALL_TARGET)
pre-build:
@(cd ${WRKSRC}; ${MAKE} ${MAKEFILE} clean )
@(cd ${WRKSRC}/btnlib; ${MAKE})
post-install:
strip $(PREFIX)/bin/saoimage

View File

@ -1 +1 @@
MD5 (saoimage-1.22.tar.gz) = 2a799cb77b81cb2cb205920e01f11780
MD5 (saoimage-1.22.tar.gz) = f1a6725d609f98ddeb51cbb96811ddf0

View File

@ -1,19 +1,20 @@
*** btnlib/makefile.orig Fri Feb 20 00:05:58 1998
--- btnlib/makefile Fri Feb 20 00:24:12 1998
***************
*** 27,33 ****
press.o remote.o resize.o util.o
LIB = libbtn.a
! XLIBH = /usr/include/X11/Xlib.h
#XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows
all: $(LIB)
--- 27,33 ----
press.o remote.o resize.o util.o
LIB = libbtn.a
! XLIBH = $(X11BASE)/include/X11/Xlib.h
#XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows
all: $(LIB)
--- btnlib/makefile.orig Wed Dec 6 14:51:17 1995
+++ btnlib/makefile Thu Sep 24 15:54:53 1998
@@ -8,7 +8,7 @@
# the library would build. It is preferable to build btnlib as part of the
# make procedure in the parent SAOimage directory.
-CFLAGS = -c -O
+CFLAGS = -c -O -I${X11BASE}/include
LINT = lint
RANLIB = ranlib
@@ -27,7 +27,7 @@
press.o remote.o resize.o util.o
LIB = libbtn.a
-XLIBH = /usr/include/X11/Xlib.h
+XLIBH = ${X11BASE}/include/X11/Xlib.h
#XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows
all: $(LIB)