From c51c76d1a7e3eab4cbb521610675adaf454da3a6 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 22 Nov 2004 09:16:19 +0000 Subject: [PATCH] Have the install scripts distinguish BINDIR from SCRIPTDIR. Handy when I do an install at work, where my platform-specific binaries go in a separate directory. git-svn-id: svn://svn.tartarus.org/sgt/utils@4875 cda61777-01e9-0310-a592-d414129be87e --- Makefile | 1 + base64/Makefile | 1 + cvt-utf8/Makefile | 5 +++-- lns/Makefile | 5 +++-- multi/Makefile | 5 +++-- nntpid/Makefile | 5 +++-- xcopy/Makefile | 1 + 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 290876d..0fb7229 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ DESTDIR = . # for `make install'; should be absolute paths PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) diff --git a/base64/Makefile b/base64/Makefile index 13d8e5e..52f9b1a 100644 --- a/base64/Makefile +++ b/base64/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) diff --git a/cvt-utf8/Makefile b/cvt-utf8/Makefile index a7b11cc..4995df2 100644 --- a/cvt-utf8/Makefile +++ b/cvt-utf8/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install @@ -28,7 +29,7 @@ release: cvt-utf8.1 rm -rf reltmp install: cvt-utf8.1 - mkdir -p $(BINDIR) - $(INSTALL) cvt-utf8 $(BINDIR)/cvt-utf8 + mkdir -p $(SCRIPTDIR) + $(INSTALL) cvt-utf8 $(SCRIPTDIR)/cvt-utf8 mkdir -p $(MANDIR) $(INSTALL) -m 0644 cvt-utf8.1 $(MANDIR)/cvt-utf8.1 diff --git a/lns/Makefile b/lns/Makefile index 5e9ffc2..9842575 100644 --- a/lns/Makefile +++ b/lns/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) @@ -30,7 +31,7 @@ release: lns.1 rm -rf reltmp install: lns.1 - mkdir -p $(BINDIR) - $(INSTALL) $(IPROG) lns $(BINDIR)/lns + mkdir -p $(SCRIPTDIR) + $(INSTALL) $(IPROG) lns $(SCRIPTDIR)/lns mkdir -p $(MANDIR) $(INSTALL) $(IDATA) lns.1 $(MANDIR)/lns.1 diff --git a/multi/Makefile b/multi/Makefile index 7ff392c..1524855 100644 --- a/multi/Makefile +++ b/multi/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) @@ -30,7 +31,7 @@ release: multi.1 rm -rf reltmp install: multi.1 - mkdir -p $(BINDIR) - $(INSTALL) $(IPROG) multi $(BINDIR)/multi + mkdir -p $(SCRIPTDIR) + $(INSTALL) $(IPROG) multi $(SCRIPTDIR)/multi mkdir -p $(MANDIR) $(INSTALL) $(IDATA) multi.1 $(MANDIR)/multi.1 diff --git a/nntpid/Makefile b/nntpid/Makefile index e83d80a..686f376 100644 --- a/nntpid/Makefile +++ b/nntpid/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) @@ -30,7 +31,7 @@ release: nntpid.1 rm -rf reltmp install: nntpid.1 - mkdir -p $(BINDIR) - $(INSTALL) $(IPROG) nntpid $(BINDIR)/nntpid + mkdir -p $(SCRIPTDIR) + $(INSTALL) $(IPROG) nntpid $(SCRIPTDIR)/nntpid mkdir -p $(MANDIR) $(INSTALL) $(IDATA) nntpid.1 $(MANDIR)/nntpid.1 diff --git a/xcopy/Makefile b/xcopy/Makefile index ffe337f..a7eb226 100644 --- a/xcopy/Makefile +++ b/xcopy/Makefile @@ -4,6 +4,7 @@ DESTDIR = . # for `make install' PREFIX = /usr/local BINDIR = $(PREFIX)/bin +SCRIPTDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man1 INSTALL = install IPROG =# flags for installing programs (default none) -- 2.11.0