Error when deleting or listing non existant resolv.confs

[openresolv] / Makefile

diff --git a/Makefile b/Makefile
index edb3853234a3846a69be1804045d2075d38387f2..b76e7c58095faa754077a544f92e3dbfbf0a4d55 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 NAME = openresolv
 NAME = openresolv

-VERSION = 1.0
+VERSION = 1.1

 PKG = $(NAME)-$(VERSION)
 
 PKG = $(NAME)-$(VERSION)
 

-DESTDIR =
-PREFIX =
+INSTALL ?= install

 MANPREFIX ?= /usr/share
 MANPREFIX ?= /usr/share

+

 ROOT = $(DESTDIR)$(PREFIX)
 ETCDIR = $(ROOT)/etc/resolvconf
 ROOT = $(DESTDIR)$(PREFIX)
 ETCDIR = $(ROOT)/etc/resolvconf

-MANDIR = $(MANPREFIX)/man/man8
+MANDIR = $(DESTDIR)$(MANPREFIX)/man/man8

 BINDIR = $(ROOT)/sbin
 VARDIR = $(DESTDIR)/var/run
 UPDATEDIR = $(ETCDIR)/update.d
 BINDIR = $(ROOT)/sbin
 VARDIR = $(DESTDIR)/var/run
 UPDATEDIR = $(ETCDIR)/update.d


@@ -16,8 +16,6 @@ RESOLVCONF = resolvconf resolvconf.8
 SUBSCRIBERS = libc dnsmasq named
 TARGET = $(RESOLVCONF) $(SUBSCRIBERS)
 
 SUBSCRIBERS = libc dnsmasq named
 TARGET = $(RESOLVCONF) $(SUBSCRIBERS)
 

-INSTALL ?= install
-

 .SUFFIXES: .in
 
 all: $(TARGET)
 .SUFFIXES: .in
 
 all: $(TARGET)