Merge branch 'master' of marples:/var/git/openresolv

[openresolv] / Makefile

diff --git a/Makefile b/Makefile
index 4389903d418592a02cdcdf1bc6c4ef2009a3b8dc..edb3853234a3846a69be1804045d2075d38387f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,11 @@
+NAME = openresolv
 VERSION = 1.0
+PKG = $(NAME)-$(VERSION)
+
 DESTDIR =
 PREFIX =
 MANPREFIX ?= /usr/share
 ROOT = $(DESTDIR)$(PREFIX)
-INSTALL = install 
 ETCDIR = $(ROOT)/etc/resolvconf
 MANDIR = $(MANPREFIX)/man/man8
 BINDIR = $(ROOT)/sbin
@@ -14,16 +16,17 @@ RESOLVCONF = resolvconf resolvconf.8
 SUBSCRIBERS = libc dnsmasq named
 TARGET = $(RESOLVCONF) $(SUBSCRIBERS)
 
-all: $(TARGET)
+INSTALL ?= install
 
-$(SUBSCRIBERS): $*.in
-       sed -e s':^PREFIX=.*:PREFIX="$(PREFIX)":' $*.in > $*
+.SUFFIXES: .in
+
+all: $(TARGET)
 
-resolvconf: $*.in
-       sed -e s':^PREFIX=.*:PREFIX="$(PREFIX)":' $*.in > $*
+.in:
+       sed -e s':^PREFIX=.*:PREFIX="$(PREFIX)":' $@.in > $@
 
-resolvconf.8:
-       sed -e 's:%%PREFIX%%:$(PREFIX):g' $*.in > $*
+resolvconf.8: resolvconf.8.in
+       sed -e 's:%%PREFIX%%:$(PREFIX):g' $@.in > $@
 
 clean:
        rm -f $(TARGET) openresolv-$(VERSION).tar.bz2
@@ -37,14 +40,14 @@ install: $(TARGET)
        $(INSTALL) -d $(ETCDIR)/update-libc.d
        $(INSTALL) -d $(UPDATEDIR)
        $(INSTALL) $(SUBSCRIBERS) $(UPDATEDIR)
-       $(INSTALL) -m 644 resolvconf.8 $(MANDIR)
+       $(INSTALL) -m 0644 resolvconf.8 $(MANDIR)
        ln -snf /var/run/resolvconf $(ETCDIR)/run
 
 dist:
-       $(INSTALL) -m 0755 -d /tmp/openresolv-$(VERSION)
-       cp -RPp . /tmp/openresolv-$(VERSION)
-       (cd /tmp/openresolv-$(VERSION); $(MAKE) clean)
-       rm -rf /tmp/openresolv-$(VERSION)/*.bz2 /tmp/openresolv-$(VERSION)/.git
-       tar cvjpf openresolv-$(VERSION).tar.bz2 -C /tmp openresolv-$(VERSION)
-       rm -rf /tmp/openresolv-$(VERSION)
-       ls -l openresolv-$(VERSION).tar.bz2
+       $(INSTALL) -d /tmp/$(PKG)
+       cp -RPp . /tmp/$(PKG)
+       (cd /tmp/$(PKG); $(MAKE) clean)
+       rm -rf /tmp/$(PKG)/*.bz2 /tmp/$(PKG)/.git
+       tar cvjpf $(PKG).tar.bz2 -C /tmp $(PKG) 
+       rm -rf /tmp/$(PKG) 
+       ls -l $(PKG).tar.bz2