Avoid recursive INSTALL definition. Switch some users to BSD_INSTALL_*.
This commit is contained in:
parent
c788545a46
commit
6b64733596
3 changed files with 23 additions and 11 deletions
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.2 2003/12/24 02:36:01 bjan2 Exp $
|
||||
$NetBSD: distinfo,v 1.3 2003/12/27 03:42:00 thomasklausner Exp $
|
||||
|
||||
SHA1 (snownews-1.4.2.tar.gz) = 6a935496d707f6fb456b6b259ca3ceb69b44505c
|
||||
Size (snownews-1.4.2.tar.gz) = 88822 bytes
|
||||
SHA1 (patch-aa) = ccdba21b156e31ca238d1c383837ff2b4bcf3d38
|
||||
SHA1 (patch-aa) = e84554ea5d7919b21ea47f5de160d23eb95b2a7a
|
||||
SHA1 (patch-ab) = b1daaff6a08e855c6a5e8126f90370db6c7873a8
|
||||
SHA1 (patch-ac) = daf0f7de6794b39b7417fde5619ae89a69fe875b
|
||||
SHA1 (patch-ac) = 95f21e21c99bbb4cecf271709904c27f3b2cd42a
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
$NetBSD: patch-aa,v 1.3 2003/12/24 22:42:02 bjan2 Exp $
|
||||
--- Makefile.inc.orig 2003-12-23 19:19:57.000000000 -0700
|
||||
+++ Makefile.inc 2003-12-23 19:20:55.000000000 -0700
|
||||
$NetBSD: patch-aa,v 1.4 2003/12/27 03:42:01 thomasklausner Exp $
|
||||
|
||||
--- Makefile.inc.orig Tue Dec 23 19:28:09 2003
|
||||
+++ Makefile.inc
|
||||
@@ -1,8 +1,7 @@
|
||||
-CC = gcc
|
||||
-MAKE = make
|
||||
|
@ -8,7 +9,7 @@ $NetBSD: patch-aa,v 1.3 2003/12/24 22:42:02 bjan2 Exp $
|
|||
-PREFIX = /usr/local
|
||||
-LOCALEPATH = $(PREFIX)/share/locale
|
||||
+MAKE = $(GMAKE)
|
||||
+INSTALL = $(INSTALL) -c
|
||||
+INSTALL = ${BSD_INSTALL_DATA} -c
|
||||
+PREFIX = $(LOCALBASE)
|
||||
+LOCALEPATH = $(PREFIX)/$(PKGLOCALEDIR)/locale
|
||||
DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.colors INSTALL INSTALL.solaris INSTALL.FreeOpenNetBSD TODO opml2snow \
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ac,v 1.1.1.1 2003/12/23 22:55:59 bjan2 Exp $
|
||||
$NetBSD: patch-ac,v 1.2 2003/12/27 03:42:01 thomasklausner Exp $
|
||||
|
||||
--- Makefile.orig 2003-12-23 15:39:02.000000000 -0700
|
||||
+++ Makefile 2003-12-23 15:39:08.000000000 -0700
|
||||
@@ -2,7 +2,7 @@
|
||||
--- Makefile.orig Tue Dec 23 19:28:09 2003
|
||||
+++ Makefile
|
||||
@@ -2,7 +2,7 @@ include Makefile.inc
|
||||
|
||||
LDFLAGS = -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS)
|
||||
OBJFILES = main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o dialog.o ui-support.o categories.o
|
||||
|
@ -11,3 +11,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/12/23 22:55:59 bjan2 Exp $
|
|||
VERSION = `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
|
||||
MAN = doc/man
|
||||
DISTDIR = snownews-$(VERSION)
|
||||
@@ -29,8 +29,8 @@ install: snownews snownews.1 locales
|
||||
if [ ! -d "$(PREFIX)/bin" ]; then \
|
||||
mkdir -p $(PREFIX)/bin; \
|
||||
fi
|
||||
- $(INSTALL) -s snownews $(PREFIX)/bin
|
||||
- $(INSTALL) opml2snow $(PREFIX)/bin
|
||||
+ $(BSD_INSTALL_PROGRAM) snownews $(PREFIX)/bin
|
||||
+ $(BSD_INSTALL_SCRIPT) opml2snow $(PREFIX)/bin
|
||||
$(MAKE) -C $(MAN) install-man
|
||||
$(MAKE) -C po install
|
||||
@echo ""
|
||||
|
|
Loading…
Reference in a new issue