cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install actual executables rather than libtool wrappers; some cleanup

Browse Source 
ok jcs@, pvalchev@
This commit is contained in:
naddy 2001-10-17 11:19:59 +00:00
parent a55f22b676
commit a1474b25ed
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comms/pilot-link/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2001/09/27 00:32:36 pvalchev Exp $ # $OpenBSD: Makefile,v 1.26 2001/10/17 11:19:59 naddy Exp $
COMMENT= "PalmPilot communication utilities" COMMENT= "PalmPilot communication utilities"
@ -6,19 +6,17 @@ VERSION= 0.9.3
DISTNAME= pilot-link.${VERSION} DISTNAME= pilot-link.${VERSION}
PKGNAME= pilot-link-${VERSION} PKGNAME= pilot-link-${VERSION}
CATEGORIES= comms palm CATEGORIES= comms palm
NEED_VERSION= 1.406 NEED_VERSION= 1.475
MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/ \ MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/ \
ftp://ftp.forth.org/pub/PalmOS/ryerson/ ftp://ftp.forth.org/pub/PalmOS/ryerson/
LIB_DEPENDS= tk83::x11/tk/8.3
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= tk83::x11/tk/8.3
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}

13
comms/pilot-link/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 23:58:36 brad Exp $ $OpenBSD: patch-Makefile_in,v 1.2 2001/10/17 11:19:59 naddy Exp $
--- Makefile.in.orig Fri May 14 02:55:33 1999 --- Makefile.in.orig Fri May 14 08:55:33 1999
+++ Makefile.in Sun Jun 3 18:32:13 2001 +++ Makefile.in Wed Oct 17 00:48:06 2001
@@ -15,11 +15,11 @@ PURELINK = @@ -15,11 +15,11 @@ PURELINK =
PURIFY = PURIFY =
@ -11,11 +11,11 @@ $OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 23:58:36 brad Exp $
# -DTCL if Tcl is available, and # -DTCL if Tcl is available, and
# -DTK if Tk is available. # -DTK if Tk is available.
-TCLTK_FLAGS = @TCLTKFLAGS@ -TCLTK_FLAGS = @TCLTKFLAGS@
+TCLTK_FLAGS = @TCLTKFLAGS@ -I/usr/X11R6/include +TCLTK_FLAGS = @TCLTKFLAGS@ -I${X11BASE}/include
# Libraries needed to link with GNU readline # Libraries needed to link with GNU readline
RLLIBS = @RLLIBS@ RLLIBS = @RLLIBS@
@@ -109,29 +109,30 @@ libcc/libpicc.a: FORCE @@ -109,29 +109,29 @@ libcc/libpicc.a: FORCE
$(SUBMAKE_COMM_CC) libpicc.a $(SUBMAKE_COMM_CC) libpicc.a
installdirs: installdirs:
@ -34,7 +34,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 23:58:36 brad Exp $
+ $(LIBTOOL) $(INSTALL_DATA) $(PICCLIB) ${DESTDIR}/$(libdir)/libpicc.la + $(LIBTOOL) $(INSTALL_DATA) $(PICCLIB) ${DESTDIR}/$(libdir)/libpicc.la
for p in $(EXECS); do \ for p in $(EXECS); do \
- $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ - $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+ $(INSTALL_PROGRAM) $$p ${DESTDIR}/$(bindir)/$$p; \ + $(LIBTOOL) $(INSTALL_PROGRAM) $$p ${DESTDIR}/$(bindir)/$$p; \
done done
for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \ for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
- $(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \ - $(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
@ -53,7 +53,6 @@ $OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 23:58:36 brad Exp $
+ $(INSTALL_DATA) $$p ${DESTDIR}/$(pixdir)/`basename $$p`; \ + $(INSTALL_DATA) $$p ${DESTDIR}/$(pixdir)/`basename $$p`; \
done done
- $(LIBTOOL) -n --finish $(libdir) - $(LIBTOOL) -n --finish $(libdir)
+ $(LIBTOOL) -n --finish ${DESTDIR}/$(libdir)
uninstall: uninstall:
-for p in $(EXECS) $(PERLEXECS) $(CXXEXECS) $(TCLEXECS); do \ -for p in $(EXECS) $(PERLEXECS) $(CXXEXECS) $(TCLEXECS); do \