I don't usually _install_ my own utilities, as such; I tend to just

symlink them into my bin directory. It's just occured to me that by
adding a bit more configurability to the `make install' targets on
utils, I can actually arrange to be able to use `lns -f' as my
install program and have `make install' do that _for_ me! Bonus.

git-svn-id: svn://svn.tartarus.org/sgt/utils@4872 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/Makefile
index 67da13e..290876d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all:
        for i in $(SUBDIRS); do make -C $$i; done

diff --git a/base64/Makefile b/base64/Makefile
index e174aa9..13d8e5e 100644 (file)
--- a/base64/Makefile
+++ b/base64/Makefile
@@ -5,6 +5,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all: base64.1 base64
 
@@ -31,6 +34,6 @@ release: base64.1
 
 install: base64 base64.1
        mkdir -p $(BINDIR)
-       install base64 $(BINDIR)/base64
+       $(INSTALL) $(IPROG) base64 $(BINDIR)/base64
        mkdir -p $(MANDIR)
-       install -m 0644 base64.1 $(MANDIR)/base64.1
+       $(INSTALL) $(IDATA) base64.1 $(MANDIR)/base64.1

diff --git a/cvt-utf8/Makefile b/cvt-utf8/Makefile
index ead7b24..a7b11cc 100644 (file)
--- a/cvt-utf8/Makefile
+++ b/cvt-utf8/Makefile
@@ -5,6 +5,7 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
 
 all: cvt-utf8.1
 
@@ -28,6 +29,6 @@ release: cvt-utf8.1
 
 install: cvt-utf8.1
        mkdir -p $(BINDIR)
-       install cvt-utf8 $(BINDIR)/cvt-utf8
+       $(INSTALL) cvt-utf8 $(BINDIR)/cvt-utf8
        mkdir -p $(MANDIR)
-       install -m 0644 cvt-utf8.1 $(MANDIR)/cvt-utf8.1
+       $(INSTALL) -m 0644 cvt-utf8.1 $(MANDIR)/cvt-utf8.1

diff --git a/lns/Makefile b/lns/Makefile
index 95849b8..5e9ffc2 100644 (file)
--- a/lns/Makefile
+++ b/lns/Makefile
@@ -5,6 +5,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all: lns.1
 
@@ -28,6 +31,6 @@ release: lns.1
 
 install: lns.1
        mkdir -p $(BINDIR)
-       install lns $(BINDIR)/lns
+       $(INSTALL) $(IPROG) lns $(BINDIR)/lns
        mkdir -p $(MANDIR)
-       install -m 0644 lns.1 $(MANDIR)/lns.1
+       $(INSTALL) $(IDATA) lns.1 $(MANDIR)/lns.1

diff --git a/multi/Makefile b/multi/Makefile
index 3b7f2d6..7ff392c 100644 (file)
--- a/multi/Makefile
+++ b/multi/Makefile
@@ -5,6 +5,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all: multi.1
 
@@ -28,6 +31,6 @@ release: multi.1
 
 install: multi.1
        mkdir -p $(BINDIR)
-       install multi $(BINDIR)/multi
+       $(INSTALL) $(IPROG) multi $(BINDIR)/multi
        mkdir -p $(MANDIR)
-       install -m 0644 multi.1 $(MANDIR)/multi.1
+       $(INSTALL) $(IDATA) multi.1 $(MANDIR)/multi.1

diff --git a/nntpid/Makefile b/nntpid/Makefile
index 6dfb875..e83d80a 100644 (file)
--- a/nntpid/Makefile
+++ b/nntpid/Makefile
@@ -5,6 +5,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all: nntpid.1
 
@@ -28,6 +31,6 @@ release: nntpid.1
 
 install: nntpid.1
        mkdir -p $(BINDIR)
-       install nntpid $(BINDIR)/nntpid
+       $(INSTALL) $(IPROG) nntpid $(BINDIR)/nntpid
        mkdir -p $(MANDIR)
-       install -m 0644 nntpid.1 $(MANDIR)/nntpid.1
+       $(INSTALL) $(IDATA) nntpid.1 $(MANDIR)/nntpid.1

diff --git a/xcopy/Makefile b/xcopy/Makefile
index cd5c7be..ffe337f 100644 (file)
--- a/xcopy/Makefile
+++ b/xcopy/Makefile
@@ -5,6 +5,9 @@ DESTDIR = .
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 X11LIB=-L/usr/X11R6/lib -lX11
 
@@ -33,6 +36,6 @@ release: xcopy.1
 
 install: xcopy xcopy.1
        mkdir -p $(BINDIR)
-       install xcopy $(BINDIR)/xcopy
+       $(INSTALL) $(IPROG) xcopy $(BINDIR)/xcopy
        mkdir -p $(MANDIR)
-       install -m 0644 xcopy.1 $(MANDIR)/xcopy.1
+       $(INSTALL) $(IDATA) xcopy.1 $(MANDIR)/xcopy.1