Don't set PREFIX or DESTDIR to blank so we work as a FreeBSD port
authorRoy Marples <roy@marples.name>
Sun, 30 Dec 2007 18:00:59 +0000 (18:00 +0000)
committerRoy Marples <roy@marples.name>
Sun, 30 Dec 2007 18:00:59 +0000 (18:00 +0000)
Makefile
dnsmasq.in

index 32c40af021ed851e46de13161931d5ddd7d73b59..08e457cc558883c28d8f012d598fa8aded333588 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ NAME = openresolv
 VERSION = 1.0
 PKG = $(NAME)-$(VERSION)
 
-DESTDIR =
-PREFIX =
+INSTALL ?= install
 MANPREFIX ?= /usr/share
+
 ROOT = $(DESTDIR)$(PREFIX)
 ETCDIR = $(ROOT)/etc/resolvconf
 MANDIR = $(DESTDIR)$(MANPREFIX)/man/man8
@@ -16,8 +16,6 @@ RESOLVCONF = resolvconf resolvconf.8
 SUBSCRIBERS = libc dnsmasq named
 TARGET = $(RESOLVCONF) $(SUBSCRIBERS)
 
-INSTALL ?= install
-
 .SUFFIXES: .in
 
 all: $(TARGET)
index a8740b330b37bcc685e3949635f2f740fa36df65..ee4a6d682044ef011a281ece70bb38e2eb1d01aa 100755 (executable)
@@ -122,9 +122,9 @@ for DN in $(uniqify ${NEWDOMAIN}); do
                set -- ${IP}
                NUM="0x$(printf "%02x" $1 $2 $3 $4)"
                if [ "${SIFS}" = "y" ]; then
-                       IFS=$OIFS
-               else
                        unset IFS
+               else
+                       IFS=$OIFS
                fi
                DBUSDEST="${DBUSDEST} uint32:$(printf "%d" ${NUM}) string:${DN%,*}"
        else