Add destdir support.

This commit is contained in:
dillo 2010-05-29 14:31:23 +00:00
parent 1008f68901
commit 4ed3fdc862
4 changed files with 43 additions and 41 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2006/10/01 21:04:14 dillo Exp $
# $NetBSD: Makefile,v 1.12 2010/05/29 14:31:23 dillo Exp $
#
DISTNAME= tads23-unix
@ -14,6 +14,8 @@ COMMENT= TADS compiler and interpreter
# for other OSs, enable appropriate Makefile sections
ONLY_FOR_PLATFORM= NetBSD-*-*
PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= ${PKGNAME_NOREV}-1
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
NO_CONFIGURE= yes

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.8 2006/10/01 21:04:14 dillo Exp $
$NetBSD: distinfo,v 1.9 2010/05/29 14:31:23 dillo Exp $
SHA1 (tads-3.0.8-1/tads23-unix.tar.gz) = 2bd4c64fd090d880b98a8a590d48482d4dfcb67b
RMD160 (tads-3.0.8-1/tads23-unix.tar.gz) = 8f83f60d01fb8549fa38adcc48fa04c92fba5250
Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes
SHA1 (patch-aa) = 02a8c913620c91669aea2c2e0f072844ab535ff4
SHA1 (patch-aa) = 8d53351305a435d3c2c5d0c1c7f60ed9cbdd7018
SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062
SHA1 (patch-ac) = 67271de4c54c49a7e3c3d37950ee0fd134abf7da
SHA1 (patch-ac) = 2c05036ff65316699533471d3cbe275e33a100b3

View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.4 2005/03/27 18:08:40 kristerw Exp $
$NetBSD: patch-aa,v 1.5 2010/05/29 14:31:23 dillo Exp $
--- tads2/Makefile.orig Fri Nov 5 14:34:49 2004
+++ tads2/Makefile Sun Mar 27 19:52:59 2005
--- tads2/Makefile.orig 2004-11-05 13:34:49.000000000 +0000
+++ tads2/Makefile
@@ -56,7 +56,7 @@
#
# DATADIR is where the TADS 2 development libraries (adv.t, std.t and
@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/27 18:08:40 kristerw Exp $
BINDIR=$(PREFIX)/bin
DATADIR=$(PREFIX)/share/tads2
@@ -278,16 +278,18 @@
@@ -278,16 +278,18 @@ MATT=Matt Herberg <meherberg@earthlink.n
# No testing has been done on pre 1.5 or a.out systems
# HAVE_TPARM is set in osunixt.h
#
@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/27 18:08:40 kristerw Exp $
#
# i386+ running DOS/Windows, using DJGPP 2.X
@@ -382,10 +384,14 @@
@@ -382,10 +384,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp
all: tadsr tadsc tdb
install: all
@ -48,14 +48,14 @@ $NetBSD: patch-aa,v 1.4 2005/03/27 18:08:40 kristerw Exp $
- install -d $(DATADIR)
- install -s -m755 tadsc tadsr tdb $(BINDIR)
- install -m644 adv.t std.t gameinfo.t $(DATADIR)
+ #install -d $(BINDIR)
+ ${BSD_INSTALL_DATA_DIR} $(DATADIR)
+ ${BSD_INSTALL_PROGRAM} tadsc $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} tadsr $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} tdb $(BINDIR)
+ ${BSD_INSTALL_DATA} adv.t $(DATADIR)
+ ${BSD_INSTALL_DATA} std.t $(DATADIR)
+ ${BSD_INSTALL_DATA} gameinfo.t $(DATADIR)
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DATADIR)
+ ${BSD_INSTALL_PROGRAM} tadsc ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} tadsr ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} tdb ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_DATA} adv.t ${DESTDIR}$(DATADIR)
+ ${BSD_INSTALL_DATA} std.t ${DESTDIR}$(DATADIR)
+ ${BSD_INSTALL_DATA} gameinfo.t ${DESTDIR}$(DATADIR)
tadsr: $(TROBJS)
$(CC) $(CFLAGS) $(TROBJS) -o tadsr $(LIBS)

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ac,v 1.3 2005/03/22 20:02:11 dillo Exp $
$NetBSD: patch-ac,v 1.4 2010/05/29 14:31:23 dillo Exp $
--- tads3/Makefile.orig 2005-03-05 11:44:48.000000000 +0100
--- tads3/Makefile.orig 2005-03-05 10:44:48.000000000 +0000
+++ tads3/Makefile
@@ -14,9 +14,9 @@
# Installation points for TADS3. Tailor these to your liking. If you install
@ -40,59 +40,59 @@ $NetBSD: patch-ac,v 1.3 2005/03/22 20:02:11 dillo Exp $
# OpenBSD
# Compiled and tested on OpenBSD 3.0
# Maintainer: Mark Wickham (macwickham@attbi.com)
@@ -216,18 +235,47 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu
@@ -216,18 +235,46 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu
all: t3make t3run t23run t3pre t3res mkchrtab
install: all install-common
- install -s -m755 t3make t3run t23run t3res mkchrtab $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3make $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3run $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t23run $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3res $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} mkchrtab $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3make ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3run ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t23run ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} t3res ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} mkchrtab ${DESTDIR}$(BINDIR)
install-common: all
- install -d $(BINDIR)
- install -d $(DOCDIR)
- install -d $(DATADIR)
+ ${BSD_INSTALL_DATA_DIR} $(DOCDIR)
+ ${BSD_INSTALL_DATA_DIR} $(DATADIR)
rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
- rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
- cp -rp t3include $(INCDIR)
- cp -rp t3library $(LIBDIR)
- cp -rp t3resource $(RESDIR)
- cp -rp doc $(DOCDIR)
- -chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
+ ${BSD_INSTALL_DATA_DIR} ${INCDIR}
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DOCDIR)
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DATADIR)
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${INCDIR}
+ for f in t3include/*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${INCDIR}; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${INCDIR}; \
+ done
+ ${BSD_INSTALL_DATA_DIR} ${LIBDIR}
+ ${BSD_INSTALL_DATA_DIR} ${LIBDIR}/adv3
+ ${BSD_INSTALL_DATA_DIR} ${LIBDIR}/adv3/en_us
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3/en_us
+ for f in t3library/*.*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${LIBDIR}; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}; \
+ done
+ for f in t3library/adv3/*.*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${LIBDIR}/adv3; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3; \
+ done
+ for f in t3library/adv3/en_us/*.*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${LIBDIR}/adv3/en_us; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3/en_us; \
+ done
+ ${BSD_INSTALL_DATA_DIR} ${RESDIR}
+ ${BSD_INSTALL_DATA_DIR} ${RESDIR}/charmap
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR}
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR}/charmap
+ for f in t3resource/charmap/*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${RESDIR}/charmap; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${RESDIR}/charmap; \
+ done
+ ${BSD_INSTALL_DATA_DIR} ${DOCDIR}
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+ for f in doc/*; \
+ do \
+ ${BSD_INSTALL_DATA} $$f ${DOCDIR}; \
+ ${BSD_INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \
+ done
clean: