diff options
author | garbled <garbled> | 1998-08-29 12:19:46 +0000 |
---|---|---|
committer | garbled <garbled> | 1998-08-29 12:19:46 +0000 |
commit | 3cb1d8cab175c3a6d841d004f70aecc25b6bafd6 (patch) | |
tree | d09fbf8d9ca79b00aaefc05791e6e7faab3c525e /games/abuse | |
parent | 3e3d0ed1fc5d510d6768c972fff92438888c38ae (diff) | |
download | pkgsrc-3cb1d8cab175c3a6d841d004f70aecc25b6bafd6.tar.gz |
Resolve some installation brain-damage as pointed out by Charles Hannum.
Main binary is no longer installed into lib/abuse.
Diffstat (limited to 'games/abuse')
-rw-r--r-- | games/abuse/patches/patch-ac | 25 | ||||
-rw-r--r-- | games/abuse/patches/patch-ad | 12 |
2 files changed, 29 insertions, 8 deletions
diff --git a/games/abuse/patches/patch-ac b/games/abuse/patches/patch-ac index ac95c183a6b..b25ee14fa72 100644 --- a/games/abuse/patches/patch-ac +++ b/games/abuse/patches/patch-ac @@ -1,7 +1,9 @@ -$NetBSD: patch-ac,v 1.1 1998/08/27 12:54:56 garbled Exp $ +$NetBSD: patch-ac,v 1.2 1998/08/29 12:19:46 garbled Exp $ --- abuse/Makefile.in.orig Wed Jul 9 00:55:21 1997 -+++ abuse/Makefile.in Sat Jul 25 01:29:21 1998 -@@ -39,6 +39,6 @@ ++++ abuse/Makefile.in Sat Aug 29 04:31:24 1998 +@@ -37,10 +37,10 @@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -12,3 +14,20 @@ $NetBSD: patch-ac,v 1.1 1998/08/27 12:54:56 garbled Exp $ +INSTALL_DATA = $(INSTALL) -o bin -g games -m 0664 +INSTALL_SCRIPT = $(INSTALL) -o bin -g games -m 0755 transform = @program_transform_name@ + + NORMAL_INSTALL = true +@@ -239,11 +239,11 @@ + + install-pkglibPROGRAMS: $(pkglib_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(pkglibdir) ++ $(mkinstalldirs) $(bindir) + @list='$(pkglib_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`"; \ +- $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`; \ ++ echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ ++ $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; \ + done + diff --git a/games/abuse/patches/patch-ad b/games/abuse/patches/patch-ad index e2f490b9113..c2c9a6181b1 100644 --- a/games/abuse/patches/patch-ad +++ b/games/abuse/patches/patch-ad @@ -1,8 +1,10 @@ -$NetBSD: patch-ad,v 1.1 1998/08/27 12:54:56 garbled Exp $ ---- abuse/abuse.in.orig Sat Jul 25 01:14:24 1998 -+++ abuse/abuse.in Sat Jul 25 01:15:15 1998 -@@ -29,3 +29,3 @@ +$NetBSD: patch-ad,v 1.2 1998/08/29 12:19:46 garbled Exp $ +--- abuse/abuse.in.orig Wed Jul 9 00:54:43 1997 ++++ abuse/abuse.in Sat Aug 29 04:26:04 1998 +@@ -27,5 +27,5 @@ + if [ x$TERM = xlinux ]; then + abuse.console ${1:+"$@"} else - abuse.x11R6 ${1:+"$@"} -+ @libdir@/abuse.x11R6 ${1:+"$@"} ++ @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"} fi |